--- freedesktop.org.xml.in.orig	2007-08-11 09:18:52.000000000 +0200
+++ freedesktop.org.xml.in	2007-08-11 09:57:25.000000000 +0200
@@ -2616,9 +2616,17 @@
     <glob pattern="*.jpe"/>
     <alias type="image/pjpeg"/>
   </mime-type>
-  <mime-type type="image/jpeg2000">
+  <mime-type type="image/jp2">
     <_comment>JPEG-2000 image</_comment>
+    <magic priority="50">
+      <match type="big32" value="0x0c6a5020" offset="3"/>
+      <match type="string" value="jp2" offset="20"/>
+    </magic>
     <glob pattern="*.jp2"/>
+    <glob pattern="*.jpg2"/>
+    <alias type="image/jpeg2000"/>
+    <alias type="image/jpeg2000-image"/>
+    <alias type="image/x-jpeg2000-image"/>
   </mime-type>
   <mime-type type="image/x-dds">
     <_comment>DirectDraw surface</_comment>