diff --git a/demo/editor-build.html b/demo/editor-build.html
index 7f791814..69a6be05 100644
--- a/demo/editor-build.html
+++ b/demo/editor-build.html
@@ -135,7 +135,7 @@
 <script type="text/javascript" charset="utf-8">
 
 require(
-    {baseUrl: "../build"},
+    { baseUrl: "../build" },
     [
         "ace/lib/event",
         "ace/editor",
@@ -148,7 +148,23 @@ require(
         "ace/mode/xml",
         "ace/mode/text",
         "ace/undomanager"
-    ], function(event, Editor, Renderer, theme, Document, JavaScriptMode, CssMode, HtmlMode, XmlMode, TextMode, UndoManager) { 
+    ], function(
+        eventMod,
+        Editor,
+        Renderer,
+        theme,
+        Document,
+        JavaScriptMode,
+        cssMod,
+        htmlMod,
+        XmlMode,
+        TextMode,
+        UndoManager
+    ) {
+
+var event = eventMod.event;
+var CssMode = cssMod.Css;
+var HtmlMode = htmlMod.Html;
 
 var docs = {}
 
diff --git a/editor.html b/editor.html
index 2251c2ab..c97f089c 100644
--- a/editor.html
+++ b/editor.html
@@ -155,7 +155,7 @@ require(
         Document,
         JavaScriptMode,
         cssMod,
-        HtmlMode,
+        htmlMod,
         XmlMode,
         TextMode,
         UndoManager
@@ -163,6 +163,7 @@ require(
 
 var event = eventMod.event;
 var CssMode = cssMod.Css;
+var HtmlMode = htmlMod.Html;
 
 var docs = {}
 
diff --git a/lib/ace/mode/html.js b/lib/ace/mode/html.js
index 525927e0..7e8314f0 100644
--- a/lib/ace/mode/html.js
+++ b/lib/ace/mode/html.js
@@ -42,7 +42,7 @@ var TextMode = require("ace/mode/text");
 var JavaScriptMode = require("ace/mode/javascript");
 var CssMode = require("ace/mode/css").Css;
 var Tokenizer = require("ace/tokenizer");
-var HtmlHighlightRules = require("ace/mode/html_highlight_rules");
+var HtmlHighlightRules = require("ace/mode/html_highlight_rules").HtmlHighlightRules;
 
 var Html = function() {
     this.$tokenizer = new Tokenizer(new HtmlHighlightRules().getRules());
@@ -97,5 +97,5 @@ oop.inherits(Html, TextMode);
 
 }).call(Html.prototype);
 
-return Html;
+exports.Html = Html;
 });
diff --git a/lib/ace/mode/html_highlight_rules.js b/lib/ace/mode/html_highlight_rules.js
index 360e7a1f..e6032b54 100644
--- a/lib/ace/mode/html_highlight_rules.js
+++ b/lib/ace/mode/html_highlight_rules.js
@@ -178,5 +178,5 @@ var HtmlHighlightRules = function() {
 
 oop.inherits(HtmlHighlightRules, TextHighlightRules);
 
-return HtmlHighlightRules;
+exports.HtmlHighlightRules = HtmlHighlightRules;
 });