diff --git a/.gitmodules b/.gitmodules
index 6857325f..5980861a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -585,3 +585,6 @@
 [submodule "vendor/grammars/G-Code"]
 	path = vendor/grammars/G-Code
 	url = https://github.com/robotmaster/sublime-text-syntax-highlighting
+[submodule "vendor/grammars/grace-tmbundle"]
+	path = vendor/grammars/grace-tmbundle
+	url = https://github.com/zmthy/grace-tmbundle
diff --git a/grammars.yml b/grammars.yml
index 2b1d2c72..ee83c6b0 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -227,6 +227,8 @@ vendor/grammars/gnuplot-tmbundle:
 - source.gnuplot
 vendor/grammars/go-tmbundle:
 - source.go
+vendor/grammars/grace-tmbundle/:
+- source.grace
 vendor/grammars/gradle.tmbundle:
 - source.groovy.gradle
 vendor/grammars/graphviz.tmbundle:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 2be249ba..dddded97 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1092,7 +1092,7 @@ Grace:
   type: programming
   extensions:
   - .grace
-  tm_scope: none
+  tm_scope: source.grace
   ace_mode: text
 
 Gradle:
diff --git a/vendor/grammars/grace-tmbundle b/vendor/grammars/grace-tmbundle
new file mode 160000
index 00000000..c342d35c
--- /dev/null
+++ b/vendor/grammars/grace-tmbundle
@@ -0,0 +1 @@
+Subproject commit c342d35c76d6a7dd5cd91157ca5b39481ef59e96