diff --git a/.gitmodules b/.gitmodules
index 315e5065..565127c5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -638,3 +638,6 @@
 [submodule "vendor/grammars/api-blueprint-sublime-plugin"]
 	path = vendor/grammars/api-blueprint-sublime-plugin
 	url = https://github.com/apiaryio/api-blueprint-sublime-plugin
+[submodule "vendor/grammars/Handlebars"]
+	path = vendor/grammars/Handlebars
+	url = https://github.com/daaain/Handlebars
diff --git a/grammars.yml b/grammars.yml
index a1250b5b..b78010d6 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -50,6 +50,8 @@ vendor/grammars/G-Code/:
 - source.gcode
 vendor/grammars/GDScript-sublime/:
 - source.gdscript
+vendor/grammars/Handlebars:
+- text.html.handlebars
 vendor/grammars/IDL-Syntax:
 - source.webidl
 vendor/grammars/InnoSetup/:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index c62f57d6..e2c82ab8 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1319,7 +1319,7 @@ Handlebars:
   extensions:
   - .handlebars
   - .hbs
-  tm_scope: none
+  tm_scope: text.html.handlebars
   ace_mode: handlebars
 
 Harbour:
diff --git a/vendor/grammars/Handlebars b/vendor/grammars/Handlebars
new file mode 160000
index 00000000..35d82156
--- /dev/null
+++ b/vendor/grammars/Handlebars
@@ -0,0 +1 @@
+Subproject commit 35d821569d562403af8b85a4e8d9acc841656b41