diff --git a/.gitmodules b/.gitmodules
index a4ef61fa..0e127f7d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -532,3 +532,6 @@
 [submodule "vendor/grammars/sublime-bsv"]
 	path = vendor/grammars/sublime-bsv
 	url = https://github.com/thotypous/sublime-bsv
+[submodule "vendor/grammars/AutoHotkey"]
+	path = vendor/grammars/AutoHotkey
+	url = https://github.com/robertcollier4/AutoHotkey
diff --git a/grammars.yml b/grammars.yml
index ebbea52c..1c11db3d 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -24,6 +24,8 @@ vendor/grammars/Agda.tmbundle:
 - source.agda
 vendor/grammars/Alloy.tmbundle:
 - source.alloy
+vendor/grammars/AutoHotkey:
+- source.ahk
 vendor/grammars/ColdFusion:
 - source.cfscript
 - source.cfscript.cfc
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 7890be55..f10b2f30 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -224,7 +224,7 @@ AutoHotkey:
   extensions:
   - .ahk
   - .ahkl
-  tm_scope: none
+  tm_scope: source.ahk
   ace_mode: autohotkey
 
 AutoIt:
diff --git a/vendor/grammars/AutoHotkey b/vendor/grammars/AutoHotkey
new file mode 160000
index 00000000..82a64672
--- /dev/null
+++ b/vendor/grammars/AutoHotkey
@@ -0,0 +1 @@
+Subproject commit 82a646722c78cff47fae9673cb628f222b032988