diff --git a/.gitmodules b/.gitmodules
index fa4fd377..cbf7a602 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,9 +22,9 @@
 [submodule "vendor/grammars/Sublime-REBOL"]
 	path = vendor/grammars/Sublime-REBOL
 	url = https://github.com/Oldes/Sublime-REBOL
-[submodule "vendor/grammars/Sublime-VimL"]
-	path = vendor/grammars/Sublime-VimL
-	url = https://github.com/SalGnt/Sublime-VimL
+[submodule "vendor/grammars/language-viml"]
+	path = vendor/grammars/language-viml
+	url = https://github.com/Alhadis/language-viml
 [submodule "vendor/grammars/ColdFusion"]
 	path = vendor/grammars/ColdFusion
 	url = https://github.com/SublimeText/ColdFusion
diff --git a/grammars.yml b/grammars.yml
index e51e8848..3a38ca96 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -103,8 +103,6 @@ vendor/grammars/Sublime-SQF-Language:
 vendor/grammars/Sublime-Text-2-OpenEdge-ABL:
 - source.abl
 - text.html.abl
-vendor/grammars/Sublime-VimL:
-- source.viml
 vendor/grammars/SublimeBrainfuck:
 - source.bf
 vendor/grammars/SublimeClarion:
@@ -414,6 +412,8 @@ vendor/grammars/language-toc-wow:
 - source.toc
 vendor/grammars/language-turing:
 - source.turing
+vendor/grammars/language-viml:
+- source.viml
 vendor/grammars/language-wavefront:
 - source.wavefront.mtl
 - source.wavefront.obj
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 861a7efa..4919a9ab 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -4001,6 +4001,7 @@ VimL:
   type: programming
   color: "#199f4b"
   search_term: vim
+  tm_scope: source.viml
   aliases:
   - vim
   - nvim
diff --git a/vendor/grammars/Sublime-VimL b/vendor/grammars/Sublime-VimL
deleted file mode 160000
index b453aff6..00000000
--- a/vendor/grammars/Sublime-VimL
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b453aff6f783769b6b895986da605a2db0db7379
diff --git a/vendor/grammars/language-viml b/vendor/grammars/language-viml
new file mode 160000
index 00000000..ccdaff45
--- /dev/null
+++ b/vendor/grammars/language-viml
@@ -0,0 +1 @@
+Subproject commit ccdaff4535b5720e9a89460afcc7b8dc65f46d27
diff --git a/vendor/licenses/grammar/language-viml.txt b/vendor/licenses/grammar/language-viml.txt
new file mode 100644
index 00000000..0bb64e03
--- /dev/null
+++ b/vendor/licenses/grammar/language-viml.txt
@@ -0,0 +1,27 @@
+---
+type: grammar
+name: language-viml
+license: mit
+---
+The MIT License (MIT)
+
+Copyright (c) 2014-2016 Evan Hahn
+Copyright (c) 2016 John Gardner
+
+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.