diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index f68ebb1d..05b45468 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -565,6 +565,8 @@ HTML+ERB:
   type: markup
   group: HTML
   lexer: RHTML
+  aliases:
+  - erb
   primary_extension: .erb
   extensions:
   - .erb
diff --git a/test/test_language.rb b/test/test_language.rb
index 96130326..15b03851 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -80,6 +80,7 @@ class TestLanguage < Test::Unit::TestCase
     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['HTML+ERB'], Language.find_by_alias('erb')
     assert_equal Language['IRC log'], Language.find_by_alias('irc')
     assert_equal Language['JSON'], Language.find_by_alias('json')
     assert_equal Language['Java Server Pages'], Language.find_by_alias('jsp')