diff --git a/addon/ng2/blueprints/ng2/files/__path__/tsconfig.json b/addon/ng2/blueprints/ng2/files/__path__/tsconfig.json
index b9b49c9e0ecc..bc7e4503c6b1 100644
--- a/addon/ng2/blueprints/ng2/files/__path__/tsconfig.json
+++ b/addon/ng2/blueprints/ng2/files/__path__/tsconfig.json
@@ -4,7 +4,6 @@
     "declaration": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "mapRoot": "",
     "module": "commonjs",
     "moduleResolution": "node",
     "noEmitOnError": true,
diff --git a/addon/ng2/blueprints/ng2/files/angular-cli-build.js b/addon/ng2/blueprints/ng2/files/angular-cli-build.js
index d5446de68943..dad887ff3dba 100644
--- a/addon/ng2/blueprints/ng2/files/angular-cli-build.js
+++ b/addon/ng2/blueprints/ng2/files/angular-cli-build.js
@@ -7,11 +7,11 @@ module.exports = function(defaults) {
     vendorNpmFiles: [
       'systemjs/dist/system-polyfills.js',
       'systemjs/dist/system.src.js',
-      'zone.js/dist/*.js',
+      'zone.js/dist/**/*.+(js|js.map)',
       'es6-shim/es6-shim.js',
-      'reflect-metadata/*.js',
-      'rxjs/**/*.js',
-      '@angular/**/*.js'
+      'reflect-metadata/**/*.+(js|js.map)',
+      'rxjs/**/*.+(js|js.map)',
+      '@angular/**/*.+(js|js.map)'
     ]
   });
 };
diff --git a/lib/broccoli/angular2-app.js b/lib/broccoli/angular2-app.js
index 8641159b0da9..328163be57a3 100644
--- a/lib/broccoli/angular2-app.js
+++ b/lib/broccoli/angular2-app.js
@@ -404,21 +404,18 @@ class Angular2App extends BroccoliPlugin {
   }
 
   _getBundleTree(preBundleTree){
-    var indexFile = path.join(this._sourceDir, 'index.html');
-    var indexContent = fs.readFileSync(indexFile, 'utf8');
-    var scriptTagVendorFiles = indexContent.match(/vendor\/[^"']*\.js/gi);
     var vendorTree = this._getVendorNpmTree();
     var assetsTree = this._getAssetsTree();
 
     var scriptTree = new BroccoliFunnel(preBundleTree, {
-      include: scriptTagVendorFiles
+      include: this._options.polyfills
     });
 
     var nonJsTree = new BroccoliFunnel(preBundleTree, {
       exclude: ['**/*.js', '**/*.js.map']
     });
     var jsTree = new BroccoliFunnel(preBundleTree, {
-      include: ['**/*.js']
+      include: ['**/*.js', '**/*.js.map']
     });
 
     var bundleTree = new BundlePlugin([jsTree]);
diff --git a/package.json b/package.json
index d1ed79d5f4a9..bfab8e88e1eb 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "shelljs": "^0.7.0",
     "silent-error": "^1.0.0",
     "symlink-or-copy": "^1.0.3",
-    "systemjs-builder": "^0.15.16",
+    "systemjs-builder": "0.15.17",
     "typescript": "^1.8.10",
     "typings": "^0.8.1"
   },