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
diff --git a/vendor/licenses/git_submodule/vscode-apache.dep.yml b/vendor/licenses/git_submodule/vscode-apache.dep.yml
new file mode 100644
index 000000000..24843fc9b
--- /dev/null
+++ b/vendor/licenses/git_submodule/vscode-apache.dep.yml
@@ -0,0 +1,33 @@
+---
+name: vscode-apache
+version: '0585b0bb3d390fc541aa27cfcfb83b3204156be3'
+type: git_submodule
+homepage: https://github.com/mrmlnc/vscode-apache.git
+license: mit
+licenses:
+- sources: LICENSE
+  text: |
+    The MIT License (MIT)
+
+    Copyright (c) Denis Malinochkin
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+- sources: README.md
+  text: This software is released under the terms of the MIT license.
+notices: []