diff --git a/public/docs/_examples/quickstart/js/index.html b/public/docs/_examples/quickstart/js/index.html
index 9181ea2c52..bec42f9dea 100644
--- a/public/docs/_examples/quickstart/js/index.html
+++ b/public/docs/_examples/quickstart/js/index.html
@@ -10,7 +10,7 @@
     <!-- #docregion libraries -->
     <!-- #docregion ie-polyfills -->
     <!-- IE required polyfill -->
-    <script src="node_modules/client/shim.min.js"></script>
+    <script src="node_modules/core-js/client/shim.min.js"></script>
     <!-- #enddocregion ie-polyfills -->
 
     <script src="node_modules/zone.js/dist/zone.js"></script>
diff --git a/public/docs/_examples/quickstart/ts/index.html b/public/docs/_examples/quickstart/ts/index.html
index 95459ad58c..a0a64d1122 100644
--- a/public/docs/_examples/quickstart/ts/index.html
+++ b/public/docs/_examples/quickstart/ts/index.html
@@ -11,7 +11,7 @@
     <!-- #docregion libraries -->
     <!-- #docregion ie-polyfills -->
      <!-- Polyfill(s) for older browsers -->
-    <script src="node_modules/client/shim.min.js"></script>
+    <script src="node_modules/core-js/client/shim.min.js"></script>
     <!-- #enddocregion ie-polyfills -->
 
     <script src="node_modules/zone.js/dist/zone.js"></script>
diff --git a/public/docs/_examples/webpack/ts/config/karma-test-shim.js b/public/docs/_examples/webpack/ts/config/karma-test-shim.js
index 7691460bcd..67a2409917 100644
--- a/public/docs/_examples/webpack/ts/config/karma-test-shim.js
+++ b/public/docs/_examples/webpack/ts/config/karma-test-shim.js
@@ -1,7 +1,7 @@
 // #docregion
 Error.stackTraceLimit = Infinity;
 
-require('es6-shim');
+require('core-js/es6');
 require('reflect-metadata');
 
 require('zone.js/dist/zone');
diff --git a/public/docs/_examples/webpack/ts/package.webpack.json b/public/docs/_examples/webpack/ts/package.webpack.json
index 041c0b41e1..618e1867ec 100644
--- a/public/docs/_examples/webpack/ts/package.webpack.json
+++ b/public/docs/_examples/webpack/ts/package.webpack.json
@@ -17,7 +17,7 @@
     "@angular/platform-browser": "2.0.0-rc.1",
     "@angular/platform-browser-dynamic": "2.0.0-rc.1",
     "@angular/router-deprecated": "2.0.0-rc.1",
-    "es6-shim": "^0.35.0",
+    "core-js": "^2.4.0",
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.6",
     "zone.js": "0.6.12"
diff --git a/public/docs/_examples/webpack/ts/src/polyfills.ts b/public/docs/_examples/webpack/ts/src/polyfills.ts
index 617af577cf..5de11fb502 100644
--- a/public/docs/_examples/webpack/ts/src/polyfills.ts
+++ b/public/docs/_examples/webpack/ts/src/polyfills.ts
@@ -1,5 +1,5 @@
 // #docregion
-import 'es6-shim';
+import 'core-js/es6';
 import 'reflect-metadata';
 require('zone.js/dist/zone');
 
diff --git a/public/docs/_examples/webpack/ts/typings.1.json b/public/docs/_examples/webpack/ts/typings.1.json
index b5324f4199..ab3d27d712 100644
--- a/public/docs/_examples/webpack/ts/typings.1.json
+++ b/public/docs/_examples/webpack/ts/typings.1.json
@@ -1,6 +1,6 @@
 {
   "ambientDependencies": {
-    "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654",
+    "core-js": "registry:dt/core-js#0.0.0+20160317120654",
     "jasmine": "registry:dt/jasmine#2.2.0+20160412134438",
     "node": "registry:dt/node#4.0.0+20160509154515"
   }
diff --git a/public/docs/ts/latest/quickstart.jade b/public/docs/ts/latest/quickstart.jade
index fb5bd5e910..870fb69099 100644
--- a/public/docs/ts/latest/quickstart.jade
+++ b/public/docs/ts/latest/quickstart.jade
@@ -362,7 +362,7 @@ h2#index Step 4: Add #[code index.html]
       We loaded the following scripts
     +makeExcerpt('index.html', 'libraries')
     :marked
-      We begin with es6-shim which monkey patches the global context (window) with essential features of ES2015 (ES6).
+      We begin with core-js's es6-him which monkey patches the global context (window) with essential features of ES2015 (ES6).
       Next are the polyfills for Angular2, `zone.js` and `reflect-metadata`.
       Then the [SystemJS](#systemjs) library for module loading.