diff --git a/gulpfile.js b/gulpfile.js
index 79483cd512f..3720c9ad721 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -85,7 +85,7 @@ var paths = {
     'public/bower_components/CodeMirror/mode/xml/xml.js',
     'public/bower_components/CodeMirror/mode/css/css.js',
     'public/bower_components/CodeMirror/mode/htmlmixed/htmlmixed.js',
-    'public/bower_components/CodeMirror/addon/emmet/emmet.js'
+    'node_modules/emmet-codemirror/dist/emmet.js'
   ],
 
   vendorMain: [
@@ -517,4 +517,3 @@ gulp.task('default', [
   'watch',
   'sync'
 ]);
-
diff --git a/package.json b/package.json
index 2db376173ef..6a9b3990dc0 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "debug": "^2.2.0",
     "dedent": "~0.6.0",
     "dotenv": "^1.2.0",
+    "emmet-codemirror": "^1.2.5",
     "errorhandler": "^1.4.2",
     "es6-map": "~0.1.1",
     "eslint": "~1.10.2",