diff --git a/demo/emmet.html b/demo/emmet.html
index 122085d9..bd0d4abe 100644
--- a/demo/emmet.html
+++ b/demo/emmet.html
@@ -23,7 +23,7 @@
 <pre id="editor"></pre>
 
 <!-- load emmet code and snippets compiled for browser -->
-<script src="https://nightwing.github.io/emmet-core/emmet.js"></script>
+<script src="https://cloud9ide.github.io/emmet-core/emmet.js"></script>
 
 <script src="kitchen-sink/require.js"></script>
 <script>
diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js
index c7beb3d0..33b2dbc0 100644
--- a/demo/kitchen-sink/demo.js
+++ b/demo/kitchen-sink/demo.js
@@ -531,7 +531,7 @@ new StatusBar(env.editor, cmdLine.container);
 
 
 var Emmet = require("ace/ext/emmet");
-net.loadScript("https://nightwing.github.io/emmet-core/emmet.js", function() {
+net.loadScript("https://cloud9ide.github.io/emmet-core/emmet.js", function() {
     Emmet.setCore(window.emmet);
     env.editor.setOption("enableEmmet", true);
 });
diff --git a/doc/site/js/main.js b/doc/site/js/main.js
index 92ce6e08..39dc202d 100644
--- a/doc/site/js/main.js
+++ b/doc/site/js/main.js
@@ -18,7 +18,7 @@ $(function() {
         });
         
         ace.config.loadModule("ace/ext/emmet", function() {
-            ace.require("ace/lib/net").loadScript("http://nightwing.github.io/emmet-core/emmet.js", function() {
+            ace.require("ace/lib/net").loadScript("http://cloud9ide.github.io/emmet-core/emmet.js", function() {
                 embedded_editor.setOption("enableEmmet", true);
                 editor.setOption("enableEmmet", true);
             });