diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb
index a2953e91..9d59aef9 100644
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -25,7 +25,7 @@ module Linguist
     #
     # Returns an array
     def self.detectable_markup
-      ["CSS", "Less", "Sass", "Markdown", "Textile", "reStructuredText"]
+      ["CSS", "Less", "Sass", "Markdown", "Textile", "reStructuredText", "AsciiDoc"]
     end
 
     # Internal: Create a new Language object
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 24afe374..e9d9281e 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -74,6 +74,16 @@ Arduino:
   lexer: C++
   primary_extension: .ino
 
+AsciiDoc:
+  type: markup
+  lexer: Text only
+  ace_mode: asciidoc
+  wrap: true
+  primary_extension: .asciidoc
+  extensions:
+  - .adoc
+  - .asc
+
 ASP:
   type: programming
   color: "#6a40fd"