diff --git a/.gitmodules b/.gitmodules
index 65d5ef54e..b531f2bd0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -260,9 +260,6 @@
 [submodule "vendor/grammars/antlr.tmbundle"]
 	path = vendor/grammars/antlr.tmbundle
 	url = https://github.com/textmate/antlr.tmbundle
-[submodule "vendor/grammars/apache.tmbundle"]
-	path = vendor/grammars/apache.tmbundle
-	url = https://github.com/textmate/apache.tmbundle
 [submodule "vendor/grammars/apex-tmLanguage"]
 	path = vendor/grammars/apex-tmLanguage
 	url = https://github.com/forcedotcom/apex-tmLanguage.git
@@ -1446,3 +1443,6 @@
 [submodule "vendor/grammars/zephir-sublime"]
 	path = vendor/grammars/zephir-sublime
 	url = https://github.com/phalcon/zephir-sublime
+[submodule "vendor/grammars/vscode-apache"]
+	path = vendor/grammars/vscode-apache
+	url = https://github.com/mrmlnc/vscode-apache.git
diff --git a/vendor/grammars/apache.tmbundle b/vendor/grammars/apache.tmbundle
deleted file mode 160000
index a12e89553..000000000
--- a/vendor/grammars/apache.tmbundle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a12e895533700b0200cca20f169be63727efff8c
diff --git a/vendor/grammars/vscode-apache b/vendor/grammars/vscode-apache
new file mode 160000
index 000000000..0585b0bb3
--- /dev/null
+++ b/vendor/grammars/vscode-apache
@@ -0,0 +1 @@
+Subproject commit 0585b0bb3d390fc541aa27cfcfb83b3204156be3