diff --git a/aio/src/environments/environment.stable.ts b/aio/src/environments/environment.stable.ts
index 47e330840b..134594626f 100644
--- a/aio/src/environments/environment.stable.ts
+++ b/aio/src/environments/environment.stable.ts
@@ -1,4 +1,4 @@
-// This is for the production site, which is hosted at https://angular.io
+// This is for the production site, which is hosted at https://angular.cn
 export const environment = {
   gaId: 'UA-80456300-1', // Production id
   production: true,
diff --git a/aio/src/index.html b/aio/src/index.html
index 04a632833b..8d9d85f818 100644
--- a/aio/src/index.html
+++ b/aio/src/index.html
@@ -109,6 +109,29 @@
       xhr.send();
     }
   </script>
+
+  <script>
+    //load CE polyfill
+    //HACK: webpack's html plugin mangles the document.write calls if we don't trick it.
+
+    //load the ES5 shim for browsers with native CE support
+    function loadCustomElementsShim(){
+      document.write('<scri' + 'pt src="assets/js/native-shim.js"><' + '/script>');
+    }
+
+    //load the full custom elements polyfill for browsers without support
+    function loadCustomElementsPolyfill(){
+      document.write('<scri' + 'pt src="assets/js/custom-elements.min.js"><' + '/script>');
+    }
+    //detect if we have native CE support
+    if(!window.customElements){
+      loadCustomElementsPolyfill();
+    }
+    else {
+      loadCustomElementsShim();
+    }
+  </script>
+
 </head>
 <body>
 
