diff --git a/.gitmodules b/.gitmodules
index 7f4d7440..af8c2d11 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -112,9 +112,6 @@
 [submodule "vendor/grammars/nesC.tmbundle"]
 	path = vendor/grammars/nesC.tmbundle
 	url = https://github.com/cdwilson/nesC.tmbundle
-[submodule "vendor/grammars/racket-tmbundle"]
-	path = vendor/grammars/racket-tmbundle
-	url = https://github.com/christophevg/racket-tmbundle
 [submodule "vendor/grammars/haxe-sublime-bundle"]
 	path = vendor/grammars/haxe-sublime-bundle
 	url = https://github.com/clemos/haxe-sublime-bundle
@@ -546,3 +543,6 @@
 [submodule "vendor/grammars/language-hy"]
 	path = vendor/grammars/language-hy
 	url = https://github.com/rwtolbert/language-hy
+[submodule "vendor/grammars/Racket"]
+	path = vendor/grammars/Racket
+	url = https://github.com/soegaard/racket-highlight-for-github
diff --git a/grammars.yml b/grammars.yml
index 46f1bdb1..bb06d939 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -56,6 +56,8 @@ vendor/grammars/PHP-Twig.tmbundle:
 - text.html.twig
 vendor/grammars/RDoc.tmbundle:
 - text.rdoc
+vendor/grammars/Racket:
+- source.racket
 vendor/grammars/SCSS.tmbundle:
 - source.scss
 vendor/grammars/Scalate.tmbundle:
@@ -362,8 +364,6 @@ vendor/grammars/python-django.tmbundle:
 vendor/grammars/r.tmbundle:
 - source.r
 - text.tex.latex.rd
-vendor/grammars/racket-tmbundle:
-- source.racket
 vendor/grammars/restructuredtext.tmbundle:
 - text.restructuredtext
 vendor/grammars/ruby-haml.tmbundle:
diff --git a/vendor/grammars/Racket b/vendor/grammars/Racket
new file mode 160000
index 00000000..02739c25
--- /dev/null
+++ b/vendor/grammars/Racket
@@ -0,0 +1 @@
+Subproject commit 02739c25aefb484a031e58ff7a628adf4c97225f
diff --git a/vendor/grammars/racket-tmbundle b/vendor/grammars/racket-tmbundle
deleted file mode 160000
index a6b66624..00000000
--- a/vendor/grammars/racket-tmbundle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a6b66624d075745d89c3221bb088c8a1925175da