diff --git a/modules/@angular/examples/_common/bootstrap.ts b/modules/@angular/examples/_common/bootstrap.ts
index 4fb6e64711..71a2fc6d4b 100644
--- a/modules/@angular/examples/_common/bootstrap.ts
+++ b/modules/@angular/examples/_common/bootstrap.ts
@@ -10,6 +10,9 @@
   writeScriptTag('/vendor/system.js');
   writeScriptTag('/vendor/Reflect.js');
   writeScriptTag('/_common/system-config.js');
+  if (location.pathname.indexOf('/upgrade/') != -1) {
+    writeScriptTag('/vendor/angular.js');
+  }
 
   function writeScriptTag(scriptUrl: string, onload: string = '') {
     document.write('<script src="' + scriptUrl + '" onload="' + onload + '"></script>');
diff --git a/modules/@angular/examples/_common/main-dynamic.ts b/modules/@angular/examples/_common/main-dynamic.ts
index d57b0fa392..54ce634363 100644
--- a/modules/@angular/examples/_common/main-dynamic.ts
+++ b/modules/@angular/examples/_common/main-dynamic.ts
@@ -6,6 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import {AppModule} from './module';
+import * as module from './module';
 
-platformBrowserDynamic().bootstrapModule(AppModule);
+if (module.AppModule) {
+  platformBrowserDynamic().bootstrapModule(module.AppModule);
+}
\ No newline at end of file
diff --git a/modules/@angular/examples/_common/system-config.ts b/modules/@angular/examples/_common/system-config.ts
index fcab1039db..eb05bd648e 100644
--- a/modules/@angular/examples/_common/system-config.ts
+++ b/modules/@angular/examples/_common/system-config.ts
@@ -19,6 +19,7 @@ System.config({
         '/vendor/@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
     '@angular/router': '/vendor/@angular/router/bundles/router.umd.js',
     '@angular/upgrade': '/vendor/@angular/upgrade/bundles/upgrade.umd.js',
+    '@angular/upgrade/static': '/vendor/@angular/upgrade/bundles/upgrade-static.umd.js',
     'rxjs': '/vendor/rxjs',
   },
   packages: {
diff --git a/modules/@angular/examples/build.sh b/modules/@angular/examples/build.sh
index 5cdf61b7f6..408fce79c6 100755
--- a/modules/@angular/examples/build.sh
+++ b/modules/@angular/examples/build.sh
@@ -20,6 +20,7 @@ mkdir $DIST/vendor/
 ln -s ../../../dist/packages-dist/ $DIST/vendor/@angular
 
 for FILE in \
+    ../../../node_modules/angular/angular.js \
     ../../../node_modules/zone.js/dist/zone.js \
     ../../../node_modules/systemjs/dist/system.js \
     ../../../node_modules/reflect-metadata/Reflect.js \
@@ -35,4 +36,6 @@ for MODULE in `find . -name module.ts`; do
   cp _common/*.html $FINAL_DIR_PATH
   cp $DIST/_common/*.js $FINAL_DIR_PATH
   cp $DIST/_common/*.js.map $FINAL_DIR_PATH
+
+  find `dirname $MODULE` -name \*.css -exec cp {} $FINAL_DIR_PATH \;
 done
diff --git a/modules/@angular/examples/tsconfig-build.json b/modules/@angular/examples/tsconfig-build.json
index a6cd3595e5..e118d7fc4a 100644
--- a/modules/@angular/examples/tsconfig-build.json
+++ b/modules/@angular/examples/tsconfig-build.json
@@ -18,7 +18,7 @@
     "target": "es5",
     "lib": ["es2015", "dom"],
     "skipLibCheck": true,
-    "types": ["jasmine", "node"]
+    "types": ["jasmine", "node", "angularjs"]
   },
   "include": [
     "./_common/*.ts",