diff --git a/.gitmodules b/.gitmodules
index d49bbd6e..d08760ce 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -364,9 +364,6 @@
 [submodule "vendor/grammars/r.tmbundle"]
 	path = vendor/grammars/r.tmbundle
 	url = https://github.com/textmate/r.tmbundle
-[submodule "vendor/grammars/restructuredtext.tmbundle"]
-	path = vendor/grammars/restructuredtext.tmbundle
-	url = https://github.com/textmate/restructuredtext.tmbundle
 [submodule "vendor/grammars/ruby-haml.tmbundle"]
 	path = vendor/grammars/ruby-haml.tmbundle
 	url = https://github.com/textmate/ruby-haml.tmbundle
@@ -737,6 +734,9 @@
 [submodule "vendor/grammars/Elm"]
 	path = vendor/grammars/Elm
 	url = https://github.com/elm-community/Elm.tmLanguage
+[submodule "vendor/grammars/language-restructuredtext"]
+	path = vendor/grammars/language-restructuredtext
+	url = https://github.com/Lukasa/language-restructuredtext
 [submodule "vendor/grammars/atom-language-clean"]
 	path = vendor/grammars/atom-language-clean
 	url = https://github.com/timjs/atom-language-clean.git
diff --git a/grammars.yml b/grammars.yml
index 5b38a5de..87db2ff9 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -377,6 +377,8 @@ vendor/grammars/language-python:
 - text.python.traceback
 vendor/grammars/language-renpy:
 - source.renpy
+vendor/grammars/language-restructuredtext:
+- text.restructuredtext
 vendor/grammars/language-shellscript:
 - source.shell
 - text.shell-session
@@ -492,8 +494,6 @@ vendor/grammars/python-django.tmbundle:
 vendor/grammars/r.tmbundle:
 - source.r
 - text.tex.latex.rd
-vendor/grammars/restructuredtext.tmbundle:
-- text.restructuredtext
 vendor/grammars/ruby-haml.tmbundle:
 - text.haml
 vendor/grammars/ruby-slim.tmbundle:
diff --git a/vendor/grammars/language-restructuredtext b/vendor/grammars/language-restructuredtext
new file mode 160000
index 00000000..71336125
--- /dev/null
+++ b/vendor/grammars/language-restructuredtext
@@ -0,0 +1 @@
+Subproject commit 71336125686fc61e26da1f0b6642930295b467de
diff --git a/vendor/grammars/restructuredtext.tmbundle b/vendor/grammars/restructuredtext.tmbundle
deleted file mode 160000
index 608d8bcd..00000000
--- a/vendor/grammars/restructuredtext.tmbundle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 608d8bcdea179d4bf3def6244e0d9cf7705f2fea
diff --git a/vendor/licenses/grammar/language-restructuredtext.txt b/vendor/licenses/grammar/language-restructuredtext.txt
new file mode 100644
index 00000000..81e4bb7d
--- /dev/null
+++ b/vendor/licenses/grammar/language-restructuredtext.txt
@@ -0,0 +1,26 @@
+---
+type: grammar
+name: language-restructuredtext
+license: mit
+---
+MIT License
+
+Copyright (c) 2014-2016 Cory Benfield
+
+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.
diff --git a/vendor/licenses/grammar/restructuredtext.tmbundle.txt b/vendor/licenses/grammar/restructuredtext.tmbundle.txt
deleted file mode 100644
index 44549780..00000000
--- a/vendor/licenses/grammar/restructuredtext.tmbundle.txt
+++ /dev/null
@@ -1,15 +0,0 @@
----
-type: grammar
-name: restructuredtext.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”.