Index: trunk/native/file-associations/bz2.properties
===================================================================
--- trunk/native/file-associations/bz2.properties	(revision 18297)
+++ trunk/native/file-associations/bz2.properties	(revision 18304)
@@ -1,3 +1,3 @@
-extension=bz2
+extension=osm.bz2
 mime-type=application/x-bzip2
 description=OpenStreetMap BZipped
Index: trunk/native/file-associations/gz.properties
===================================================================
--- trunk/native/file-associations/gz.properties	(revision 18297)
+++ trunk/native/file-associations/gz.properties	(revision 18304)
@@ -1,3 +1,3 @@
-extension=gz
+extension=osm.gz
 mime-type=application/gzip
 description=OpenStreetMap GZipped
Index: trunk/native/file-associations/osm.properties
===================================================================
--- trunk/native/file-associations/osm.properties	(revision 18297)
+++ trunk/native/file-associations/osm.properties	(revision 18304)
@@ -1,3 +1,3 @@
 extension=osm
-mime-type=application/x-osm+xml
+mime-type=application/vnd.openstreetmap.data+xml
 description=OpenStreetMap
Index: trunk/native/file-associations/xz.properties
===================================================================
--- trunk/native/file-associations/xz.properties	(revision 18304)
+++ trunk/native/file-associations/xz.properties	(revision 18304)
@@ -0,0 +1,3 @@
+extension=osm.gz
+mime-type=application/x-xz
+description=OpenStreetMap XZipped
Index: trunk/native/file-associations/zip.properties
===================================================================
--- trunk/native/file-associations/zip.properties	(revision 18297)
+++ trunk/native/file-associations/zip.properties	(revision 18304)
@@ -1,3 +1,3 @@
-extension=zip
+extension=osm.zip
 mime-type=application/zip
 description=OpenStreetMap Zipped
Index: trunk/native/linux/latest/usr/share/applications/org.openstreetmap.josm-latest.desktop
===================================================================
--- trunk/native/linux/latest/usr/share/applications/org.openstreetmap.josm-latest.desktop	(revision 18297)
+++ trunk/native/linux/latest/usr/share/applications/org.openstreetmap.josm-latest.desktop	(revision 18304)
@@ -8,5 +8,5 @@
 Exec=josm-latest %U
 Terminal=false
-MimeType=application/geo+json;application/gpx+xml;application/gzip;application/x-bzip;application/x-bzip;application/x-gpx+xml;application/x-josm-session+xml;application/x-josm-session+zip;application/x-osm+xml;application/x-xz;application/zip;x-scheme-handler/geo;
+MimeType=application/geo+json;application/gpx+xml;application/gzip;application/vnd.openstreetmap.data+xml;application/x-bzip2;application/x-gpx+xml;application/x-josm-session+xml;application/x-josm-session+zip;application/x-osm+xml;application/x-xz;application/zip;x-scheme-handler/geo;
 StartupNotify=true
 Categories=Education;Geoscience;Maps;
Index: trunk/native/linux/latest/usr/share/mime/packages/josm-latest.xml
===================================================================
--- trunk/native/linux/latest/usr/share/mime/packages/josm-latest.xml	(revision 18297)
+++ trunk/native/linux/latest/usr/share/mime/packages/josm-latest.xml	(revision 18304)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-        <mime-type type="application/x-osm+xml">
+        <mime-type type="application/vnd.openstreetmap.data+xml">
                 <sub-class-of type="application/xml"/>
                 <comment>OSM XML file</comment>
Index: trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop
===================================================================
--- trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop	(revision 18297)
+++ trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop	(revision 18304)
@@ -8,5 +8,5 @@
 Exec=josm %U
 Terminal=false
-MimeType=application/geo+json;application/gpx+xml;application/gzip;application/x-bzip;application/x-bzip;application/x-gpx+xml;application/x-josm-session+xml;application/x-josm-session+zip;application/x-osm+xml;application/x-xz;application/zip;x-scheme-handler/geo;
+MimeType=application/geo+json;application/gpx+xml;application/gzip;application/vnd.openstreetmap.data+xml;application/x-bzip2;application/x-gpx+xml;application/x-josm-session+xml;application/x-josm-session+zip;application/x-osm+xml;application/x-xz;application/zip;x-scheme-handler/geo;
 StartupNotify=true
 Categories=Education;Geoscience;Maps;
Index: trunk/native/linux/tested/usr/share/mime/packages/josm.xml
===================================================================
--- trunk/native/linux/tested/usr/share/mime/packages/josm.xml	(revision 18297)
+++ trunk/native/linux/tested/usr/share/mime/packages/josm.xml	(revision 18304)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-        <mime-type type="application/x-osm+xml">
+        <mime-type type="application/vnd.openstreetmap.data+xml">
                 <sub-class-of type="application/xml"/>
                 <comment>OSM XML file</comment>
Index: trunk/native/macosx/macos-jpackage.sh
===================================================================
--- trunk/native/macosx/macos-jpackage.sh	(revision 18297)
+++ trunk/native/macosx/macos-jpackage.sh	(revision 18304)
@@ -87,4 +87,5 @@
     --file-associations native/file-associations/joz.properties \
     --file-associations native/file-associations/osm.properties \
+    --file-associations native/file-associations/xz.properties \
     --file-associations native/file-associations/zip.properties \
     --add-modules java.base,java.datatransfer,java.desktop,java.logging,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.sql,java.transaction.xa,java.xml,jdk.crypto.ec,jdk.jfr,jdk.jsobject,jdk.unsupported,jdk.unsupported.desktop,jdk.xml.dom,javafx.controls,javafx.media,javafx.swing,javafx.web
Index: trunk/native/windows/win-jpackage.sh
===================================================================
--- trunk/native/windows/win-jpackage.sh	(revision 18297)
+++ trunk/native/windows/win-jpackage.sh	(revision 18304)
@@ -77,4 +77,5 @@
     --file-associations native/file-associations/joz.properties \
     --file-associations native/file-associations/osm.properties \
+    --file-associations native/file-associations/xz.properties \
     --file-associations native/file-associations/zip.properties \
     --add-launcher HWConsole=native/windows/MLConsole.properties \