diff --git a/.gitmodules b/.gitmodules
index 77fd2474..6857325f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -582,3 +582,6 @@
 [submodule "vendor/grammars/TXL"]
 	path = vendor/grammars/TXL
 	url = https://github.com/MikeHoffert/Sublime-Text-TXL-syntax
+[submodule "vendor/grammars/G-Code"]
+	path = vendor/grammars/G-Code
+	url = https://github.com/robotmaster/sublime-text-syntax-highlighting
diff --git a/grammars.yml b/grammars.yml
index 0e8b5e01..2b1d2c72 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -39,6 +39,12 @@ vendor/grammars/Docker.tmbundle:
 - source.dockerfile
 vendor/grammars/Elm.tmLanguage:
 - source.elm
+vendor/grammars/G-Code/:
+- source.LS
+- source.MCPOST
+- source.MOD
+- source.apt
+- source.gcode
 vendor/grammars/GDScript-sublime/:
 - source.gdscript
 vendor/grammars/Handlebars:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 6598563e..2be249ba 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -942,7 +942,7 @@ G-code:
   - .g
   - .gco
   - .gcode
-  tm_scope: none
+  tm_scope: source.gcode
   ace_mode: gcode
 
 GAMS:
diff --git a/vendor/grammars/G-Code b/vendor/grammars/G-Code
new file mode 160000
index 00000000..81e8b03e
--- /dev/null
+++ b/vendor/grammars/G-Code
@@ -0,0 +1 @@
+Subproject commit 81e8b03e3dc71f2c8eddfb389dbda21a320f45c1