diff --git a/addon/ng2/blueprints/ng2/files/src/index.html b/addon/ng2/blueprints/ng2/files/src/index.html
index a4f90f06cc..1974451355 100644
--- a/addon/ng2/blueprints/ng2/files/src/index.html
+++ b/addon/ng2/blueprints/ng2/files/src/index.html
@@ -22,7 +22,16 @@
 <body>
   <<%= htmlComponentName %>-app>Loading...</<%= htmlComponentName %>-app>
 
-  <script src="thirdparty/vendor.js"></script>
+  <script src="vendor/es6-shim/es6-shim.js"></script>
+  <script src="vendor/systemjs/dist/system-polyfills.js"></script>
+  <script src="vendor/angular2/bundles/angular2-polyfills.js"></script>
+  <script src="vendor/systemjs/dist/system.src.js"></script>
+  <script src="vendor/rxjs/bundles/Rx.js"></script>
+
+  <script src="vendor/angular2/bundles/angular2.dev.js"></script>
+  <script src="vendor/angular2/bundles/http.dev.js"></script>
+  <script src="vendor/angular2/bundles/router.dev.js"></script>
+
   <script src="thirdparty/libs.js"></script>
   <script>
     System.config({
diff --git a/lib/broccoli/angular2-app.js b/lib/broccoli/angular2-app.js
index 0c0d86d880..2cb6ba39a9 100644
--- a/lib/broccoli/angular2-app.js
+++ b/lib/broccoli/angular2-app.js
@@ -63,15 +63,6 @@ Angular2App.prototype.toTree = function() {
       destDir: 'vendor'
     });
 
-    var vendorNpmInputFiles = vendorNpmFiles.map(function(file) {
-      return '**/' + file.substr(file.lastIndexOf('/') + 1);
-    });
-
-    var vendorNpmJs = new Concat(vendorNpmTree, {
-      inputFiles: vendorNpmInputFiles,
-      outputFile: '/thirdparty/vendor.js'
-    });
-
     var thirdPartyJsTree = new Funnel('node_modules', {
       include: ['ng2*/bundles/*.js'],
       exclude: ['ng2*/bundles/*.min.js', 'ng2*/bundles/*.standalone.js'],
@@ -89,7 +80,7 @@ Angular2App.prototype.toTree = function() {
       tsTree,
       jsTree,
       this.index(),
-      vendorNpmJs,
+      vendorNpmTree,
       thirdPartyJs
     ], { overwrite: true });
 
diff --git a/tests/e2e/e2e_workflow.spec.js b/tests/e2e/e2e_workflow.spec.js
index c6cc50a88f..0a294d3c29 100644
--- a/tests/e2e/e2e_workflow.spec.js
+++ b/tests/e2e/e2e_workflow.spec.js
@@ -78,7 +78,7 @@ describe('Basic end-to-end Workflow', function () {
       
     // Check that a few critical files have been detected.
     expect(lines).to.include('/index.html');
-    expect(lines).to.include('/thirdparty/vendor.js');
+    expect(lines).to.include('/thirdparty/libs.js');
   });
 
   it('Perform `ng test` after initial build', function() {
