diff --git a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
index 8e1956cd33..62e3d56ca8 100644
--- a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
+++ b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
@@ -5189,6 +5189,15 @@
       <match value="-----BEGIN EC PARAMETERS-----" type="string" offset="0"/>
     </magic>
   </mime-type>
+  <mime-type type="application/x-java-keystore">
+  	<_comment>Java Keystore</_comment>
+    <tika:link>https://en.wikipedia.org/wiki/Java_KeyStore</tika:link>
+    <magic priority="50">
+    	<!-- magic byte: https://en.wikipedia.org/wiki/List_of_file_signatures -->
+        <match value="0xfeedfeed" type="string" offset="0:4"/>
+    </magic>
+    <glob pattern="*.jks" />
+  </mime-type>
 
   <mime-type type="application/x-xfig">
     <glob pattern="*.fig"/>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
index bc81c70944..adf28e341c 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/mime/TestMimeTypes.java
@@ -1227,6 +1227,7 @@ public void testCertificatesKeys() throws Exception {
         // Once solved, see TIKA-3784, ought to work for name or data
         //assertType("application/x-pkcs12", "testRSAKEYandCERT.p12");
         //assertTypeByData("application/x-pkcs12", "testRSAKEYandCERT.p12"); // pass=tika
+        assertTypeByData("application/x-java-keystore", "KeyStore.jks");
     }
 
     @Test
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/KeyStore.jks b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/KeyStore.jks
new file mode 100644
index 0000000000..2e6419c0a9
Binary files /dev/null and b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/resources/test-documents/KeyStore.jks differ