diff --git a/lib/linguist/mime.rb b/lib/linguist/mime.rb
index a7ce257e..26bf2cb1 100644
--- a/lib/linguist/mime.rb
+++ b/lib/linguist/mime.rb
@@ -1,5 +1,11 @@
 require 'mime/types'
 
+# Register 'ear' and 'war' as java
+java = MIME::Types['application/java-archive'].first
+java.extensions << 'ear'
+java.extensions << 'war'
+MIME::Types.index_extensions(java)
+
 module Linguist
   module Mime
     Special = YAML.load_file(File.expand_path("../special_mime_types.yml", __FILE__))
diff --git a/test/test_mime.rb b/test/test_mime.rb
index b32e137e..097cd87c 100644
--- a/test/test_mime.rb
+++ b/test/test_mime.rb
@@ -16,5 +16,9 @@ class TestMime < Test::Unit::TestCase
     assert_equal 'text/plain; charset=utf-8', Mime.lookup(".latex")
 
     assert_equal 'application/octet-stream', Mime.lookup(".dmg")
+
+    assert_equal 'application/java-archive', Mime.lookup(".jar")
+    assert_equal 'application/java-archive', Mime.lookup(".ear")
+    assert_equal 'application/java-archive', Mime.lookup(".war")
   end
 end