diff --git a/.gitmodules b/.gitmodules
index 136013b2..985b81d3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -630,3 +630,6 @@
 [submodule "vendor/grammars/Lean.tmbundle"]
 	path = vendor/grammars/Lean.tmbundle
 	url = https://github.com/leanprover/Lean.tmbundle
+[submodule "vendor/grammars/openscad.tmbundle"]
+	path = vendor/grammars/openscad.tmbundle
+	url = https://github.com/tbuser/openscad.tmbundle
diff --git a/grammars.yml b/grammars.yml
index 6d933a09..7f4f89ee 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -383,6 +383,8 @@ vendor/grammars/ooc.tmbundle:
 - source.ooc
 vendor/grammars/opa.tmbundle:
 - source.opa
+vendor/grammars/openscad.tmbundle/:
+- source.scad
 vendor/grammars/oz-tmbundle/Syntaxes/Oz.tmLanguage:
 - source.oz
 vendor/grammars/pascal.tmbundle:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 413683e5..73abc785 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -2117,7 +2117,7 @@ OpenSCAD:
   type: programming
   extensions:
   - .scad
-  tm_scope: none
+  tm_scope: source.scad
   ace_mode: scad
 
 Org:
diff --git a/vendor/grammars/openscad.tmbundle b/vendor/grammars/openscad.tmbundle
new file mode 160000
index 00000000..4b2bc0a8
--- /dev/null
+++ b/vendor/grammars/openscad.tmbundle
@@ -0,0 +1 @@
+Subproject commit 4b2bc0a8e100d8f0350fd74f6c40dd956c118355