diff --git a/.gitmodules b/.gitmodules
index bb4871bd..a4462410 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -597,3 +597,6 @@
 [submodule "vendor/grammars/InnoSetup"]
 	path = vendor/grammars/InnoSetup
 	url = https://github.com/idleberg/InnoSetup-Sublime-Text
+[submodule "vendor/grammars/gap-tmbundle"]
+	path = vendor/grammars/gap-tmbundle
+	url = https://github.com/dhowden/gap-tmbundle
diff --git a/grammars.yml b/grammars.yml
index d7dd24de..fc6a808e 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -225,6 +225,8 @@ vendor/grammars/fortran.tmbundle:
 - source.fortran.modern
 vendor/grammars/fsharpbinding:
 - source.fsharp
+vendor/grammars/gap-tmbundle/:
+- source.gap
 vendor/grammars/gettext.tmbundle:
 - source.po
 vendor/grammars/gnuplot-tmbundle:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 28fdae5a..c8938202 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -961,7 +961,7 @@ GAP:
   - .gd
   - .gi
   - .tst
-  tm_scope: none
+  tm_scope: source.gap
   ace_mode: text
 
 GAS:
diff --git a/vendor/grammars/gap-tmbundle b/vendor/grammars/gap-tmbundle
new file mode 160000
index 00000000..291a0469
--- /dev/null
+++ b/vendor/grammars/gap-tmbundle
@@ -0,0 +1 @@
+Subproject commit 291a0469dd4eb7082b08e828edc8bf0cfbb9b599