Index: freedesktop.org.xml.in
===================================================================
RCS file: /cvs/mime/shared-mime-info/freedesktop.org.xml.in,v
retrieving revision 1.415
diff -u -r1.415 freedesktop.org.xml.in
--- freedesktop.org.xml.in	21 Apr 2009 09:23:34 -0000	1.415
+++ freedesktop.org.xml.in	20 Jul 2009 20:30:09 -0000
@@ -1733,6 +1733,22 @@
       <match type="string" value="&lt;jnlp" offset="0:256"/>
     </magic>
   </mime-type>
+  <mime-type type="application/x-java-keystore">
+    <_comment>Java keystore</_comment>
+    <magic priority="50">
+      <match type="host32" value="0xfeedfeed" offset="0"/>
+    </magic>
+    <glob pattern="*.jks"/>
+    <glob pattern="*.ks"/>
+    <glob pattern="cacerts"/>
+  </mime-type>
+  <mime-type type="application/x-java-jce-keystore">
+    <_comment>Java JCE keystore</_comment>
+    <magic priority="50">
+      <match type="host32" value="0xcececece" offset="0"/>
+    </magic>
+    <glob pattern="*.jceks"/>
+  </mime-type>
   <mime-type type="application/x-java-pack200">
     <_comment>Pack200 Java archive</_comment>
     <generic-icon name="package-x-generic"/>
Index: tests/list
===================================================================
RCS file: /cvs/mime/shared-mime-info/tests/list,v
retrieving revision 1.86
diff -u -r1.86 list
--- tests/list	20 May 2009 13:04:09 -0000	1.86
+++ tests/list	20 Jul 2009 20:30:09 -0000
@@ -210,5 +210,7 @@
 Stallman_Richard_-_The_GNU_Manifesto.fb2 application/x-fictionbook+xml
 test.p7b application/x-pkcs7-certificates ox
 test.pkipath application/pkix-pkipath ox
+test.jks application/x-java-keystore
+test.jceks application/x-java-jce-keystore
 test.sav application/x-spss-sav
 test.por application/x-spss-por