diff --git a/.gitmodules b/.gitmodules
index 2dfd20a5..c774827a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -446,9 +446,6 @@
 [submodule "vendor/grammars/Scalate.tmbundle"]
 	path = vendor/grammars/Scalate.tmbundle
 	url = https://github.com/scalate/Scalate.tmbundle
-[submodule "vendor/grammars/Elm.tmLanguage"]
-	path = vendor/grammars/Elm.tmLanguage
-	url = https://github.com/deadfoxygrandpa/Elm.tmLanguage
 [submodule "vendor/grammars/sublime-bsv"]
 	path = vendor/grammars/sublime-bsv
 	url = https://github.com/thotypous/sublime-bsv
@@ -734,3 +731,6 @@
 [submodule "vendor/grammars/nu.tmbundle"]
 	path = vendor/grammars/nu.tmbundle
 	url = https://github.com/jsallis/nu.tmbundle
+[submodule "vendor/grammars/Elm"]
+	path = vendor/grammars/Elm
+	url = https://github.com/elm-community/Elm.tmLanguage
diff --git a/grammars.yml b/grammars.yml
index ae593508..afaab00f 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -36,7 +36,7 @@ vendor/grammars/ColdFusion:
 - text.html.cfm
 vendor/grammars/Docker.tmbundle:
 - source.dockerfile
-vendor/grammars/Elm.tmLanguage:
+vendor/grammars/Elm/:
 - source.elm
 vendor/grammars/FreeMarker.tmbundle:
 - text.html.ftl
diff --git a/vendor/grammars/Elm b/vendor/grammars/Elm
new file mode 160000
index 00000000..227327e3
--- /dev/null
+++ b/vendor/grammars/Elm
@@ -0,0 +1 @@
+Subproject commit 227327e33e1ceecb7da9d276a89fef4f21ee64ed
diff --git a/vendor/grammars/Elm.tmLanguage b/vendor/grammars/Elm.tmLanguage
deleted file mode 160000
index 155ce91c..00000000
--- a/vendor/grammars/Elm.tmLanguage
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 155ce91c81a3b98fdf2785fe69b5460a3075d9f0
diff --git a/vendor/licenses/grammar/Elm.tmLanguage.txt b/vendor/licenses/grammar/Elm.txt
similarity index 98%
rename from vendor/licenses/grammar/Elm.tmLanguage.txt
rename to vendor/licenses/grammar/Elm.txt
index 878d6862..7f04b933 100644
--- a/vendor/licenses/grammar/Elm.tmLanguage.txt
+++ b/vendor/licenses/grammar/Elm.txt
@@ -1,6 +1,6 @@
 ---
 type: grammar
-name: Elm.tmLanguage
+name: Elm
 license: mit
 ---
 The MIT License (MIT)