diff --git a/.gitmodules b/.gitmodules
index e10defdf..860d0354 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -528,9 +528,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
 [submodule "vendor/grammars/Sublime-HTTP"]
 	path = vendor/grammars/Sublime-HTTP
 	url = https://github.com/httpspec/sublime-highlighting
@@ -555,6 +552,9 @@
 [submodule "vendor/grammars/liquid.tmbundle"]
 	path = vendor/grammars/liquid.tmbundle
 	url = https://github.com/bastilian/validcode-textmate-bundles
+[submodule "vendor/grammars/AutoHotkey"]
+	path = vendor/grammars/AutoHotkey
+	url = https://github.com/ahkscript/AutoHotkey
 [submodule "vendor/grammars/ats.sublime"]
 	path = vendor/grammars/ats.sublime
 	url = https://github.com/steinwaywhw/ats-mode-sublimetext
diff --git a/grammars.yml b/grammars.yml
index 85d06129..dff21de3 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -24,7 +24,7 @@ vendor/grammars/Agda.tmbundle:
 - source.agda
 vendor/grammars/Alloy.tmbundle:
 - source.alloy
-vendor/grammars/AutoHotkey:
+vendor/grammars/AutoHotkey/:
 - source.ahk
 vendor/grammars/ColdFusion:
 - source.cfscript