diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 9c754c96..f68ebb1d 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -545,6 +545,8 @@ Groovy Server Pages:
 HTML:
   type: markup
   ace_mode: html
+  aliases:
+  - xhtml
   primary_extension: .html
   extensions:
   - .htm
diff --git a/test/test_language.rb b/test/test_language.rb
index ae0071dd..96130326 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -78,6 +78,7 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal Language['Emacs Lisp'], Language.find_by_alias('emacs-lisp')
     assert_equal Language['Gettext Catalog'], Language.find_by_alias('pot')
     assert_equal Language['HTML'], Language.find_by_alias('html')
+    assert_equal Language['HTML'], Language.find_by_alias('xhtml')
     assert_equal Language['HTML+ERB'], Language.find_by_alias('html+erb')
     assert_equal Language['IRC log'], Language.find_by_alias('irc')
     assert_equal Language['JSON'], Language.find_by_alias('json')