diff --git a/.gitmodules b/.gitmodules
index 6a9ab13f..c776f0b2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -692,6 +692,9 @@
 [submodule "vendor/grammars/FreeMarker.tmbundle"]
 	path = vendor/grammars/FreeMarker.tmbundle
 	url = https://github.com/freemarker/FreeMarker.tmbundle
+[submodule "vendor/grammars/MagicPython"]
+	path = vendor/grammars/MagicPython
+	url = git@github.com:MagicStack/MagicPython.git
 [submodule "vendor/grammars/language-click"]
 	path = vendor/grammars/language-click
 	url = https://github.com/stenverbois/language-click.git
diff --git a/grammars.yml b/grammars.yml
index 0319774a..2b7b5c8d 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -69,6 +69,9 @@ vendor/grammars/Lean.tmbundle:
 - source.lean
 vendor/grammars/LiveScript.tmbundle:
 - source.livescript
+vendor/grammars/MagicPython:
+- source.python
+- source.regexp.python
 vendor/grammars/Modelica/:
 - source.modelica
 vendor/grammars/NSIS:
@@ -356,8 +359,6 @@ vendor/grammars/language-maxscript:
 vendor/grammars/language-ncl:
 - source.ncl
 vendor/grammars/language-python:
-- source.python
-- source.regexp.python
 - text.python.console
 - text.python.traceback
 vendor/grammars/language-renpy:
diff --git a/vendor/grammars/MagicPython b/vendor/grammars/MagicPython
new file mode 160000
index 00000000..13bf5348
--- /dev/null
+++ b/vendor/grammars/MagicPython
@@ -0,0 +1 @@
+Subproject commit 13bf534834036911c57d15c40242e45783aad1ba