diff --git a/.gitmodules b/.gitmodules
index 25d1d8d5..aa73532f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -280,9 +280,6 @@
 [submodule "vendor/grammars/groovy.tmbundle"]
 	path = vendor/grammars/groovy.tmbundle
 	url = https://github.com/textmate/groovy.tmbundle
-[submodule "vendor/grammars/haskell.tmbundle"]
-	path = vendor/grammars/haskell.tmbundle
-	url = https://github.com/textmate/haskell.tmbundle
 [submodule "vendor/grammars/html.tmbundle"]
 	path = vendor/grammars/html.tmbundle
 	url = https://github.com/textmate/html.tmbundle
@@ -755,6 +752,9 @@ url = https://github.com/austinwagner/sublime-sourcepawn
 [submodule "vendor/grammars/language-roff"]
 	path = vendor/grammars/language-roff
 	url = https://github.com/Alhadis/language-roff
+[submodule "vendor/grammars/language-haskell"]
+	path = vendor/grammars/language-haskell
+	url = https://github.com/atom-haskell/language-haskell
 [submodule "vendor/grammars/language-asn1"]
 	path = vendor/grammars/language-asn1
 	url = https://github.com/ajLangley12/language-asn1
diff --git a/grammars.yml b/grammars.yml
index e403dbfe..de015d25 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -294,9 +294,6 @@ vendor/grammars/graphviz.tmbundle:
 - source.dot
 vendor/grammars/groovy.tmbundle:
 - source.groovy
-vendor/grammars/haskell.tmbundle:
-- source.haskell
-- text.tex.latex.haskell
 vendor/grammars/haxe-sublime-bundle:
 - source.erazor
 - source.haxe.2
@@ -369,6 +366,15 @@ vendor/grammars/language-gfm:
 - source.gfm
 vendor/grammars/language-graphql:
 - source.graphql
+vendor/grammars/language-haskell:
+- hint.haskell
+- hint.message.haskell
+- hint.type.haskell
+- source.c2hs
+- source.cabal
+- source.haskell
+- source.hsc2hs
+- text.tex.latex.haskell
 vendor/grammars/language-hy:
 - source.hy
 vendor/grammars/language-inform7:
diff --git a/vendor/grammars/haskell.tmbundle b/vendor/grammars/haskell.tmbundle
deleted file mode 160000
index df3d5427..00000000
--- a/vendor/grammars/haskell.tmbundle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit df3d54278a3ab3cfb30c37d94e06587478cc79ad
diff --git a/vendor/grammars/language-haskell b/vendor/grammars/language-haskell
new file mode 160000
index 00000000..16e6122e
--- /dev/null
+++ b/vendor/grammars/language-haskell
@@ -0,0 +1 @@
+Subproject commit 16e6122e17ac5705dd18a1680142f29d059a4724
diff --git a/vendor/licenses/grammar/haskell.tmbundle.txt b/vendor/licenses/grammar/haskell.tmbundle.txt
deleted file mode 100644
index 12ab34cf..00000000
--- a/vendor/licenses/grammar/haskell.tmbundle.txt
+++ /dev/null
@@ -1,15 +0,0 @@
----
-type: grammar
-name: haskell.tmbundle
-license: permissive
-curated: true
----
-
-If not otherwise specified (see below), files in this repository fall under the following license:
-
-	Permission to copy, use, modify, sell and distribute this
-	software is granted. This software is provided "as is" without
-	express or implied warranty, and with no claim as to its
-	suitability for any purpose.
-
-An exception is made for files in readable text which contain their own license information, or files where an accompanying file exists (in the same directory) with a “-license” suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example “tidy” is accompanied by “tidy-license.txt”.
diff --git a/vendor/licenses/grammar/language-haskell.txt b/vendor/licenses/grammar/language-haskell.txt
new file mode 100644
index 00000000..d46acdb4
--- /dev/null
+++ b/vendor/licenses/grammar/language-haskell.txt
@@ -0,0 +1,26 @@
+---
+type: grammar
+name: language-haskell
+license: mit
+---
+The MIT License (MIT)
+
+Copyright (c) 2015 Atom-Haskell
+
+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.