diff --git a/.gitmodules b/.gitmodules
index 9a37dcd4..7f4d7440 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -528,6 +528,9 @@
 [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
 [submodule "vendor/grammars/Sublime-HTTP"]
 	path = vendor/grammars/Sublime-HTTP
 	url = https://github.com/httpspec/sublime-highlighting
diff --git a/grammars.yml b/grammars.yml
index 1421c2f6..46f1bdb1 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 7172b86e..7bd8072d 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/test/test_grammars.rb b/test/test_grammars.rb
index f010b79b..188bc187 100644
--- a/test/test_grammars.rb
+++ b/test/test_grammars.rb
@@ -60,7 +60,7 @@ class TestGrammars < Minitest::Test
   def test_submodules_have_licenses
     categories = submodule_paths.group_by do |submodule|
       files = Dir[File.join(ROOT, submodule, "*")]
-      license = files.find { |path| File.basename(path) =~ /\blicen[cs]e\b/i } || files.find { |path| File.basename(path) =~ /\bcopying\b/i }
+      license = files.find { |path| File.basename(path) =~ /\b(un)?licen[cs]e\b/i } || files.find { |path| File.basename(path) =~ /\bcopying\b/i }
       if license.nil?
         if readme = files.find { |path| File.basename(path) =~ /\Areadme\b/i }
           license = readme if File.read(readme) =~ /\blicen[cs]e\b/i
diff --git a/vendor/grammars/AutoHotkey b/vendor/grammars/AutoHotkey
new file mode 160000
index 00000000..a2207359
--- /dev/null
+++ b/vendor/grammars/AutoHotkey
@@ -0,0 +1 @@
+Subproject commit a2207359782c564a9a3bfe5142d7b5a250d9b18b