diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000000..0a2ce6a38a4
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "CodeMirror/wikipedia-ios-codemirror"]
+	path = CodeMirror/wikipedia-ios-codemirror
+	url = https://github.com/wikimedia/wikipedia-ios-codemirror.git
diff --git a/CodeMirror/wikipedia-ios-codemirror b/CodeMirror/wikipedia-ios-codemirror
new file mode 160000
index 00000000000..f9fc7fae054
--- /dev/null
+++ b/CodeMirror/wikipedia-ios-codemirror
@@ -0,0 +1 @@
+Subproject commit f9fc7fae0549ebc844d845a47688555443b388a1
diff --git a/www/Gruntfile.js b/www/Gruntfile.js
index c6f088db94d..121bd41fe40 100644
--- a/www/Gruntfile.js
+++ b/www/Gruntfile.js
@@ -50,7 +50,7 @@ module.exports = function (grunt) {
           },
           {
             expand: true,
-            cwd: '../Carthage/Checkouts/wikipedia-ios-codemirror/resources/',
+            cwd: '../CodeMirror/wikipedia-ios-codemirror/resources/',
             src: ['**'],
             dest: `${distFolder}codemirror/resources/`
           },