diff --git a/.gitmodules b/.gitmodules
index 720575db..fc0e87fe 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -820,4 +820,7 @@
 	url = https://github.com/Alhadis/language-regexp
 [submodule "vendor/grammars/Terraform.tmLanguage"]
 	path = vendor/grammars/Terraform.tmLanguage
-	url = https://github.com/alexlouden/Terraform.tmLanguage
\ No newline at end of file
+	url = https://github.com/alexlouden/Terraform.tmLanguage
+[submodule "vendor/grammars/shaders-tmLanguage"]
+	path = vendor/grammars/shaders-tmLanguage
+	url = https://github.com/tgjones/shaders-tmLanguage
diff --git a/grammars.yml b/grammars.yml
index 74165002..64c34c67 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -573,6 +573,9 @@ vendor/grammars/scilab.tmbundle:
 - source.scilab
 vendor/grammars/secondlife-lsl:
 - source.lsl
+vendor/grammars/shaders-tmLanguage:
+- source.hlsl
+- source.shaderlab
 vendor/grammars/smali-sublime:
 - source.smali
 vendor/grammars/smalltalk-tmbundle:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index b61ec121..974de085 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1598,7 +1598,7 @@ HLSL:
   - ".fxh"
   - ".hlsli"
   ace_mode: text
-  tm_scope: none
+  tm_scope: source.hlsl
   language_id: 145
 HTML:
   type: markup
diff --git a/vendor/grammars/shaders-tmLanguage b/vendor/grammars/shaders-tmLanguage
new file mode 160000
index 00000000..cd1ef40f
--- /dev/null
+++ b/vendor/grammars/shaders-tmLanguage
@@ -0,0 +1 @@
+Subproject commit cd1ef40f549f9ce2b9e6b73498688de114a85382
diff --git a/vendor/licenses/grammar/shaders-tmLanguage.txt b/vendor/licenses/grammar/shaders-tmLanguage.txt
new file mode 100644
index 00000000..1c1ee0cd
--- /dev/null
+++ b/vendor/licenses/grammar/shaders-tmLanguage.txt
@@ -0,0 +1,26 @@
+---
+type: grammar
+name: shaders-tmLanguage
+license: mit
+---
+MIT License
+
+Copyright (c) 2017 Tim Jones
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.