diff --git a/.gitmodules b/.gitmodules
index 1e5c07a5..35ee9a73 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -686,3 +686,6 @@
 [submodule "vendor/grammars/sourcepawn"]
 	path = vendor/grammars/sourcepawn
 	url = https://github.com/austinwagner/sublime-sourcepawn
+[submodule "vendor/grammars/gdscript"]
+	path = vendor/grammars/gdscript
+	url = https://github.com/beefsack/GDScript-sublime
diff --git a/grammars.yml b/grammars.yml
index b0599853..83d3a560 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -257,6 +257,8 @@ vendor/grammars/fortran.tmbundle:
 - source.fortran.modern
 vendor/grammars/gap-tmbundle/:
 - source.gap
+vendor/grammars/gdscript/:
+- source.gdscript
 vendor/grammars/gettext.tmbundle:
 - source.po
 vendor/grammars/gnuplot-tmbundle:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index af12e2f9..11cc2e9e 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1114,7 +1114,7 @@ GDScript:
   type: programming
   extensions:
   - .gd
-  tm_scope: none
+  tm_scope: source.gdscript
   ace_mode: text
 
 GLSL:
diff --git a/vendor/grammars/gdscript b/vendor/grammars/gdscript
new file mode 160000
index 00000000..202295c5
--- /dev/null
+++ b/vendor/grammars/gdscript
@@ -0,0 +1 @@
+Subproject commit 202295c51c8c919d2be1da3ecbe83b140e2264e8
diff --git a/vendor/licenses/grammar/gdscript.txt b/vendor/licenses/grammar/gdscript.txt
new file mode 100644
index 00000000..d3baa230
--- /dev/null
+++ b/vendor/licenses/grammar/gdscript.txt
@@ -0,0 +1,12 @@
+---
+type: grammar
+name: gdscript
+license: mit
+---
+Copyright (c) 2016 Michael Alexander
+
+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.