diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 6f234aad..c61ebd72 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -545,6 +545,7 @@ HTML+Django:
   lexer: HTML+Django/Jinja
   primary_extension: .mustache # TODO: This is incorrect
   extensions:
+  - .jinja
   - .mustache
 
 HTML+ERB:
diff --git a/test/test_language.rb b/test/test_language.rb
index 6d5029dd..3ca231b5 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -243,6 +243,7 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal [Language['Shell']], Language.find_by_filename('bash_profile')
     assert_equal [Language['Shell']], Language.find_by_filename('.zshrc')
     assert_equal [Language['Clojure']], Language.find_by_filename('riemann.config')
+    assert_equal [Language['HTML+Django']], Language.find_by_filename('index.jinja')
   end
 
   def test_find