diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js
index 4a12d3f0..98441af7 100644
--- a/demo/kitchen-sink/demo.js
+++ b/demo/kitchen-sink/demo.js
@@ -55,7 +55,7 @@ var MultiSelect = require("ace/multi_select").MultiSelect;
 var whitespace = require("ace/ext/whitespace");
 
 var doclist = require("./doclist");
-var modelist = require("./modelist");
+var modelist = require("ace/ext/modelist");
 var layout = require("./layout");
 var TokenTooltip = require("./token_tooltip").TokenTooltip;
 var util = require("./util");
diff --git a/demo/kitchen-sink/doclist.js b/demo/kitchen-sink/doclist.js
index 7e3feb47..d2339dc7 100644
--- a/demo/kitchen-sink/doclist.js
+++ b/demo/kitchen-sink/doclist.js
@@ -35,7 +35,7 @@ var EditSession = require("ace/edit_session").EditSession;
 var UndoManager = require("ace/undomanager").UndoManager;
 var net = require("ace/lib/net");
 
-var modelist = require("./modelist");
+var modelist = require("ace/ext/modelist");
 /*********** demo documents ***************************/
 var fileCache = {};
 
diff --git a/tool/mode_creator.js b/tool/mode_creator.js
index cb633a8b..f3d9f1a5 100644
--- a/tool/mode_creator.js
+++ b/tool/mode_creator.js
@@ -6,7 +6,7 @@ var net = require("ace/lib/net");
 var Range = require("ace/range").Range;
 var util = require("demo/kitchen-sink/util");
 var layout = require("demo/kitchen-sink/layout");
-var modelist = require("demo/kitchen-sink/modelist");
+var modelist = require("ace/ext/modelist");
 var doclist = require("demo/kitchen-sink/doclist");
 var TokenTooltip = require("demo/kitchen-sink/token_tooltip").TokenTooltip;