diff --git a/.gitmodules b/.gitmodules
index a0d875c8..45926ba8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -526,3 +526,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
diff --git a/grammars.yml b/grammars.yml
index d0671c53..1aba99e7 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -31,6 +31,8 @@ vendor/grammars/ColdFusion:
 - text.html.cfm
 vendor/grammars/Docker.tmbundle:
 - source.dockerfile
+vendor/grammars/Elm.tmLanguage:
+- source.elm
 vendor/grammars/Handlebars:
 - text.html.handlebars
 vendor/grammars/IDL-Syntax:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 7130bc6d..47346647 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -789,7 +789,7 @@ Elm:
   type: programming
   extensions:
   - .elm
-  tm_scope: source.haskell
+  tm_scope: source.elm
   ace_mode: elm
 
 Emacs Lisp:
diff --git a/vendor/grammars/Elm.tmLanguage b/vendor/grammars/Elm.tmLanguage
new file mode 160000
index 00000000..1d2e0963
--- /dev/null
+++ b/vendor/grammars/Elm.tmLanguage
@@ -0,0 +1 @@
+Subproject commit 1d2e0963012d4959d5517c3dd0dcf486b1ded74b