diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index de6aad48..c96b8667 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -269,6 +269,13 @@ Factor:
   extensions:
   - .factor
 
+Fancy:
+  major: true
+  lexer: Fancy
+  extensions:
+  - .fy
+  - .fancypack
+
 GAS:
   group: Assembly
   extensions:
diff --git a/test/test_language.rb b/test/test_language.rb
index 17d16cf4..4faf7709 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -38,6 +38,7 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal Lexer['Dylan'], Language['Dylan'].lexer
     assert_equal Lexer['Erlang'], Language['Erlang'].lexer
     assert_equal Lexer['Factor'], Language['Factor'].lexer
+    assert_equal Lexer['Fancy'], Language['Fancy'].lexer
     assert_equal Lexer['Fortran'], Language['FORTRAN'].lexer
     assert_equal Lexer['GAS'], Language['GAS'].lexer
     assert_equal Lexer['Genshi'], Language['Genshi'].lexer