diff --git a/package.json b/package.json
index 0da972783909..fb0c7f59241a 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "@angular/compiler-cli": "^2.3.1",
     "@angular/core": "^2.3.1",
     "@angular/tsc-wrapped": "^0.5.0",
+    "apply-loader": "^1.0.0",
     "autoprefixer": "^6.5.3",
     "chalk": "^1.1.3",
     "common-tags": "^1.3.1",
@@ -81,6 +82,8 @@
     "opn": "4.0.2",
     "portfinder": "~1.0.12",
     "postcss-loader": "^0.13.0",
+    "pug": "2.0.0-beta11",
+    "pug-loader": "^2.3.0",
     "raw-loader": "^0.5.1",
     "resolve": "^1.1.7",
     "rimraf": "^2.5.3",
diff --git a/packages/@angular/cli/models/webpack-configs/common.ts b/packages/@angular/cli/models/webpack-configs/common.ts
index 81829a3b3a68..cbf853836025 100644
--- a/packages/@angular/cli/models/webpack-configs/common.ts
+++ b/packages/@angular/cli/models/webpack-configs/common.ts
@@ -17,6 +17,9 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
  *
  * require('source-map-loader')
  * require('raw-loader')
+ * require('apply-loader')
+ * require('pug-loader')
+ * require('pug')
  * require('script-loader')
  * require('json-loader')
  * require('url-loader')
@@ -104,6 +107,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
         { enforce: 'pre', test: /\.js$/, loader: 'source-map-loader', exclude: [nodeModules] },
         { test: /\.json$/, loader: 'json-loader' },
         { test: /\.html$/, loader: 'raw-loader' },
+        { test: /\.(pug|jade)/, loaders: ['apply-loader', 'pug-loader']},
         { test: /\.(eot|svg)$/, loader: `file-loader?name=[name]${hashFormat.file}.[ext]` },
         {
           test: /\.(jpg|png|gif|otf|ttf|woff|woff2|cur|ani)$/,
diff --git a/packages/@angular/cli/package.json b/packages/@angular/cli/package.json
index 2df914d490a9..3b5a313f1b7d 100644
--- a/packages/@angular/cli/package.json
+++ b/packages/@angular/cli/package.json
@@ -34,6 +34,7 @@
     "@ngtools/json-schema": "1.0.3",
     "@ngtools/webpack": "1.2.10",
     "autoprefixer": "^6.5.3",
+    "apply-loader": "^1.0.0",
     "chalk": "^1.1.3",
     "common-tags": "^1.3.1",
     "css-loader": "^0.26.1",
@@ -66,6 +67,8 @@
     "opn": "4.0.2",
     "portfinder": "~1.0.12",
     "postcss-loader": "^0.13.0",
+    "pug": "2.0.0-beta11",
+    "pug-loader": "^2.3.0",
     "raw-loader": "^0.5.1",
     "resolve": "^1.1.7",
     "rimraf": "^2.5.3",