diff --git a/public/docs/_examples/_boilerplate/systemjs.config.js b/public/docs/_examples/_boilerplate/systemjs.config.js
index 457f040fc0..61a41af209 100644
--- a/public/docs/_examples/_boilerplate/systemjs.config.js
+++ b/public/docs/_examples/_boilerplate/systemjs.config.js
@@ -23,6 +23,7 @@
       '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
       '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
       '@angular/upgrade': 'npm:@angular/upgrade/bundles/upgrade.umd.js',
+      '@angular/upgrade/static': 'npm:@angular/upgrade/bundles/upgrade-static.umd.js',
 
       // other libraries
       'rxjs':                      'npm:rxjs',
diff --git a/public/docs/_examples/_boilerplate/systemjs.config.web.build.js b/public/docs/_examples/_boilerplate/systemjs.config.web.build.js
index 3fa201a280..f7aa2e5ce0 100644
--- a/public/docs/_examples/_boilerplate/systemjs.config.web.build.js
+++ b/public/docs/_examples/_boilerplate/systemjs.config.web.build.js
@@ -50,6 +50,7 @@
       '@angular/router': 'ng:router-builds/master/bundles/router.umd.js',
       '@angular/forms': 'ng:forms-builds/master/bundles/forms.umd.js',
       '@angular/upgrade': 'ng:upgrade-builds/master/bundles/upgrade.umd.js',
+      '@angular/upgrade/static': 'npm:@angular/upgrade/bundles/upgrade-static.umd.js',
 
       // angular testing umd bundles (overwrite the shim mappings)
       '@angular/core/testing': 'ng:core-builds/master/bundles/core-testing.umd.js',
diff --git a/public/docs/_examples/_boilerplate/systemjs.config.web.js b/public/docs/_examples/_boilerplate/systemjs.config.web.js
index 40e6a67fc6..3b9c743ea2 100644
--- a/public/docs/_examples/_boilerplate/systemjs.config.web.js
+++ b/public/docs/_examples/_boilerplate/systemjs.config.web.js
@@ -47,6 +47,7 @@
       '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
       '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
       '@angular/upgrade': 'npm:@angular/upgrade/bundles/upgrade.umd.js',
+      '@angular/upgrade/static': 'npm:@angular/upgrade/bundles/upgrade-static.umd.js',
 
       // other libraries
       'rxjs':                      'npm:rxjs',
diff --git a/public/docs/_examples/upgrade-module/ts/index-1-2-hybrid-bootstrap.html b/public/docs/_examples/upgrade-module/ts/index-1-2-hybrid-bootstrap.html
index a9f67f2096..593dafe854 100644
--- a/public/docs/_examples/upgrade-module/ts/index-1-2-hybrid-bootstrap.html
+++ b/public/docs/_examples/upgrade-module/ts/index-1-2-hybrid-bootstrap.html
@@ -16,7 +16,6 @@
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
     <script src="systemjs.config.js"></script>
-    <script src="systemjs.config.extras.js"></script>
     <script>
     System.import('app/1-2-hybrid-bootstrap/app.module')
           .then(null, console.error.bind(console));
diff --git a/public/docs/_examples/upgrade-module/ts/index-1-to-2-projection.html b/public/docs/_examples/upgrade-module/ts/index-1-to-2-projection.html
index 6d43ac1ac5..a779fb57ba 100644
--- a/public/docs/_examples/upgrade-module/ts/index-1-to-2-projection.html
+++ b/public/docs/_examples/upgrade-module/ts/index-1-to-2-projection.html
@@ -16,7 +16,6 @@
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
     <script src="systemjs.config.js"></script>
-    <script src="systemjs.config.extras.js"></script>
     <script>
       System.import('app/1-to-2-projection/app.module')
             .then(null, console.error.bind(console));
diff --git a/public/docs/_examples/upgrade-module/ts/index-1-to-2-providers.html b/public/docs/_examples/upgrade-module/ts/index-1-to-2-providers.html
index 7106fd07c4..281a23aeec 100644
--- a/public/docs/_examples/upgrade-module/ts/index-1-to-2-providers.html
+++ b/public/docs/_examples/upgrade-module/ts/index-1-to-2-providers.html
@@ -16,7 +16,6 @@
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
     <script src="systemjs.config.js"></script>
-    <script src="systemjs.config.extras.js"></script>
     <script>
       System.import('app/1-to-2-providers/app.module')
             .then(null, console.error.bind(console));
diff --git a/public/docs/_examples/upgrade-module/ts/index-2-to-1-providers.html b/public/docs/_examples/upgrade-module/ts/index-2-to-1-providers.html
index ed9d308486..1652b9f397 100644
--- a/public/docs/_examples/upgrade-module/ts/index-2-to-1-providers.html
+++ b/public/docs/_examples/upgrade-module/ts/index-2-to-1-providers.html
@@ -16,7 +16,6 @@
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
     <script src="systemjs.config.js"></script>
-    <script src="systemjs.config.extras.js"></script>
     <script>
       System.import('app/2-to-1-providers/app.module')
             .then(null, console.error.bind(console));
diff --git a/public/docs/_examples/upgrade-module/ts/index-2-to-1-transclusion.html b/public/docs/_examples/upgrade-module/ts/index-2-to-1-transclusion.html
index 3c5227b20e..a40579e3be 100644
--- a/public/docs/_examples/upgrade-module/ts/index-2-to-1-transclusion.html
+++ b/public/docs/_examples/upgrade-module/ts/index-2-to-1-transclusion.html
@@ -16,7 +16,6 @@
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
     <script src="systemjs.config.js"></script>
-    <script src="systemjs.config.extras.js"></script>
     <script>
       System.import('app/2-to-1-transclusion/app.module')
             .then(null, console.error.bind(console));
diff --git a/public/docs/_examples/upgrade-module/ts/index-downgrade-io.html b/public/docs/_examples/upgrade-module/ts/index-downgrade-io.html
index 3df65ef5a2..5899dd12de 100644
--- a/public/docs/_examples/upgrade-module/ts/index-downgrade-io.html
+++ b/public/docs/_examples/upgrade-module/ts/index-downgrade-io.html
@@ -16,7 +16,6 @@
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
     <script src="systemjs.config.js"></script>
-    <script src="systemjs.config.extras.js"></script>
     <script>
       System.import('app/downgrade-io/app.module')
             .then(null, console.error.bind(console));
diff --git a/public/docs/_examples/upgrade-module/ts/index-downgrade-static.html b/public/docs/_examples/upgrade-module/ts/index-downgrade-static.html
index 25e87913b1..44f2bfc829 100644
--- a/public/docs/_examples/upgrade-module/ts/index-downgrade-static.html
+++ b/public/docs/_examples/upgrade-module/ts/index-downgrade-static.html
@@ -16,7 +16,6 @@
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
     <script src="systemjs.config.js"></script>
-    <script src="systemjs.config.extras.js"></script>
     <script>
       System.import('app/downgrade-static/app.module')
             .then(null, console.error.bind(console));
diff --git a/public/docs/_examples/upgrade-module/ts/index-upgrade-io.html b/public/docs/_examples/upgrade-module/ts/index-upgrade-io.html
index 96867aaad1..7e1570dcfa 100644
--- a/public/docs/_examples/upgrade-module/ts/index-upgrade-io.html
+++ b/public/docs/_examples/upgrade-module/ts/index-upgrade-io.html
@@ -16,7 +16,6 @@
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
     <script src="systemjs.config.js"></script>
-    <script src="systemjs.config.extras.js"></script>
     <script>
       System.import('app/upgrade-io/app.module')
             .then(null, console.error.bind(console));
diff --git a/public/docs/_examples/upgrade-module/ts/index-upgrade-static.html b/public/docs/_examples/upgrade-module/ts/index-upgrade-static.html
index ef08896b50..6083cb52a2 100644
--- a/public/docs/_examples/upgrade-module/ts/index-upgrade-static.html
+++ b/public/docs/_examples/upgrade-module/ts/index-upgrade-static.html
@@ -16,7 +16,6 @@
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
     <script src="systemjs.config.js"></script>
-    <script src="systemjs.config.extras.js"></script>
     <script>
       System.import('app/upgrade-static/app.module')
             .then(null, console.error.bind(console));
diff --git a/public/docs/_examples/upgrade-module/ts/systemjs.config.extras.js b/public/docs/_examples/upgrade-module/ts/systemjs.config.extras.js
deleted file mode 100644
index 607b668e68..0000000000
--- a/public/docs/_examples/upgrade-module/ts/systemjs.config.extras.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// #docregion
-/** App specific SystemJS configuration */
-System.config({
-  map: {
-    '@angular/upgrade/static': 'npm:@angular/upgrade/bundles/upgrade-static.umd.js',
-  }
-});
diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/index.html b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/index.html
index d4503ccc1d..29964a6b15 100644
--- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/index.html
+++ b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/index.html
@@ -32,7 +32,6 @@
     <script src="/node_modules/systemjs/dist/system.src.js"></script>
     <!-- #enddocregion ng2 -->
     <script src="/systemjs.config.1.js"></script>
-    <script src="/systemjs.config.extras.js"></script>
     <!-- #docregion ng2
     <script src="/systemjs.config.js"></script>
     <script>
diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/systemjs.config.1.js b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/systemjs.config.1.js
index 18b947dbb5..b801d42bad 100644
--- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/systemjs.config.1.js
+++ b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/systemjs.config.1.js
@@ -22,6 +22,7 @@
       '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
       '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
       '@angular/upgrade': 'npm:@angular/upgrade/bundles/upgrade.umd.js',
+      '@angular/upgrade/static': 'npm:@angular/upgrade/bundles/upgrade-static.umd.js',
 
       // other libraries
       'rxjs':                      'npm:rxjs',
diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/systemjs.config.extras.js b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/systemjs.config.extras.js
deleted file mode 100644
index 607b668e68..0000000000
--- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/systemjs.config.extras.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// #docregion
-/** App specific SystemJS configuration */
-System.config({
-  map: {
-    '@angular/upgrade/static': 'npm:@angular/upgrade/bundles/upgrade-static.umd.js',
-  }
-});