diff --git a/extensions/handlebars/package.json b/extensions/handlebars/package.json
index b73f50a4234..6df6610da26 100644
--- a/extensions/handlebars/package.json
+++ b/extensions/handlebars/package.json
@@ -6,7 +6,7 @@
     "vscode": "0.10.x"
   },
   "scripts": {
-    "update-grammar": "node ../../build/npm/update-grammar.js daaain/Handlebars grammars/Handlebars.json ./syntaxes/Handlebars.json"
+    "update-grammar": "node ../../build/npm/update-grammar.js daaain/Handlebars grammars/Handlebars.json ./syntaxes/Handlebars.tmLanguage.json"
   },
 	"contributes": {
 		"languages": [{
@@ -19,7 +19,7 @@
 		"grammars": [{
       "language": "handlebars",
 			"scopeName": "text.html.handlebars",
-			"path": "./syntaxes/Handlebars.json"
+			"path": "./syntaxes/Handlebars.tmLanguage.json"
 		}]
   }
 }
diff --git a/extensions/handlebars/syntaxes/Handlebars.json b/extensions/handlebars/syntaxes/Handlebars.tmLanguage.json
similarity index 97%
rename from extensions/handlebars/syntaxes/Handlebars.json
rename to extensions/handlebars/syntaxes/Handlebars.tmLanguage.json
index b354cb6f2f9..9e3579d90c2 100644
--- a/extensions/handlebars/syntaxes/Handlebars.json
+++ b/extensions/handlebars/syntaxes/Handlebars.tmLanguage.json
@@ -327,7 +327,7 @@
 			]
 		},
 		"end_block": {
-			"begin": "(\\{\\{~?/)([a-zA-Z0-9_\\.-]+)\\s*",
+			"begin": "(\\{\\{~?/)([a-zA-Z0-9/_\\.-]+)\\s*",
 			"end": "(~?\\}\\})",
 			"name": "meta.function.block.end.handlebars",
 			"endCaptures": {
@@ -428,7 +428,7 @@
 			]
 		},
 		"block_helper": {
-			"begin": "(\\{\\{~?\\#)([-a-zA-Z0-9_\\./]+)\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*",
+			"begin": "(\\{\\{~?\\#)([-a-zA-Z0-9_\\./>]+)\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*",
 			"end": "(~?\\}\\})",
 			"name": "meta.function.block.start.handlebars",
 			"endCaptures": {
@@ -522,7 +522,7 @@
 			"match": "\\\\\""
 		},
 		"partial_and_var": {
-			"begin": "(\\{\\{~?\\{*(>|!<)*)\\s*(@?[-a-zA-Z0-9_\\./]+)*",
+			"begin": "(\\{\\{~?\\{*(>|!<)*)\\s*(@?[-a-zA-Z0-9$_\\./]+)*",
 			"end": "(~?\\}\\}\\}*)",
 			"name": "meta.function.inline.other.handlebars",
 			"beginCaptures": {
@@ -558,7 +558,7 @@
 			"name": "entity.other.attribute-name.handlebars"
 		},
 		"handlebars_attribute_value": {
-			"begin": "([-a-zA-Z0-9_\\./]+)\\b\\s*",
+			"begin": "([-a-zA-Z0-9_\\./]+)\\b",
 			"captures": {
 				"1": {
 					"name": "variable.parameter.handlebars"
@@ -850,5 +850,5 @@
 		"tmpl"
 	],
 	"uuid": "70E91676-DE0A-4266-A2B9-3AD2E535E484",
-	"version": "https://github.com/daaain/Handlebars/commit/bdaec7aaf5eaac45d1878096110d1db7975fb100"
+	"version": "https://github.com/daaain/Handlebars/commit/4e8244410815da73f93375532939d48bd5a9bb93"
 }
\ No newline at end of file