diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 630d64dc..ff4235e7 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -60,6 +60,14 @@ AppleScript:
   - .applescript
   - .scpt
 
+AutoHotkey:
+  type: programming
+  lexer: Text only
+  aliases:
+  - ahk
+  extensions:
+  - .ahk
+
 Arc:
   type: programming
   lexer: Text only
diff --git a/test/fixtures/hello.ahk b/test/fixtures/hello.ahk
new file mode 100644
index 00000000..ff963eb7
--- /dev/null
+++ b/test/fixtures/hello.ahk
@@ -0,0 +1 @@
+MsgBox, Hello`, World!
diff --git a/test/test_blob.rb b/test/test_blob.rb
index 26d116ad..88c0bd16 100644
--- a/test/test_blob.rb
+++ b/test/test_blob.rb
@@ -341,6 +341,9 @@ class TestBlob < Test::Unit::TestCase
     assert_equal Language['Groovy Server Pages'], blob("hello-resources.gsp").language
     assert_equal Language['Groovy Server Pages'], blob("hello-pagedirective.gsp").language
     assert_equal Language['Groovy Server Pages'], blob("hello-var.gsp").language
+
+    # https://github.com/Lexikos/AutoHotkey_L
+    assert_equal Language['AutoHotkey'], blob("hello.ahk").language
   end
 
   def test_lexer