diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 93b8adc5..b1c2ef0f 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1324,6 +1324,8 @@ XSLT:
 
 YAML:
   type: markup
+  aliases:
+  - yml
   primary_extension: .yml
   extensions:
   - .yaml
diff --git a/test/test_language.rb b/test/test_language.rb
index fb18563a..6173dc23 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -109,6 +109,7 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal Language['VimL'], Language.find_by_alias('vim')
     assert_equal Language['VimL'], Language.find_by_alias('viml')
     assert_equal Language['reStructuredText'], Language.find_by_alias('rst')
+    assert_equal Language['YAML'], Language.find_by_alias('yml')
   end
 
   def test_groups