Index: /trunk/linux/latest/usr/share/applications/org.openstreetmap.josm-latest.desktop
===================================================================
--- /trunk/linux/latest/usr/share/applications/org.openstreetmap.josm-latest.desktop	(revision 15914)
+++ /trunk/linux/latest/usr/share/applications/org.openstreetmap.josm-latest.desktop	(revision 15915)
@@ -8,5 +8,5 @@
 Exec=josm-latest %U
 Terminal=false
-MimeType=application/x-osm+xml;application/x-gpx+xml;x-scheme-handler/geo;
+MimeType=application/x-osm+xml;application/x-gpx+xml;application/geo+json;application/x-josm-session+xml;application/x-josm-session+zip;x-scheme-handler/geo;
 StartupNotify=true
 Categories=Education;Geoscience;Maps;
Index: /trunk/linux/latest/usr/share/doc/josm-latest/copyright
===================================================================
--- /trunk/linux/latest/usr/share/doc/josm-latest/copyright	(revision 15914)
+++ /trunk/linux/latest/usr/share/doc/josm-latest/copyright	(revision 15915)
@@ -1,3 +1,3 @@
-Copyright (c) 2005-2015 JOSM developers <josm-dev@openstreetmap.org>
+Copyright (c) 2005-2020 JOSM developers <josm-dev@openstreetmap.org>
 
 License: GPL3+
Index: /trunk/linux/latest/usr/share/mime/packages/josm-latest.xml
===================================================================
--- /trunk/linux/latest/usr/share/mime/packages/josm-latest.xml	(revision 15915)
+++ /trunk/linux/latest/usr/share/mime/packages/josm-latest.xml	(revision 15915)
@@ -0,0 +1,18 @@
+<?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">
+                <sub-class-of type="application/xml"/>
+                <comment>OSM XML file</comment>
+                <glob pattern="*.osm"/>
+        </mime-type>
+        <mime-type type="application/x-josm-session+xml">
+                <sub-class-of type="application/xml"/>
+                <comment>JOSM session file</comment>
+                <glob pattern="*.jos"/>
+        </mime-type>
+        <mime-type type="application/x-josm-session+zip">
+                <sub-class-of type="application/zip"/>
+                <comment>JOSM session archive</comment>
+                <glob pattern="*.joz"/>
+        </mime-type>
+</mime-info>
Index: /trunk/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop
===================================================================
--- /trunk/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop	(revision 15914)
+++ /trunk/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop	(revision 15915)
@@ -8,5 +8,5 @@
 Exec=josm %U
 Terminal=false
-MimeType=application/x-osm+xml;application/x-gpx+xml;x-scheme-handler/geo;
+MimeType=application/x-osm+xml;application/x-gpx+xml;application/geo+json;application/x-josm-session+xml;application/x-josm-session+zip;x-scheme-handler/geo;
 StartupNotify=true
 Categories=Education;Geoscience;Maps;
Index: /trunk/linux/tested/usr/share/doc/josm/copyright
===================================================================
--- /trunk/linux/tested/usr/share/doc/josm/copyright	(revision 15914)
+++ /trunk/linux/tested/usr/share/doc/josm/copyright	(revision 15915)
@@ -1,3 +1,3 @@
-Copyright (c) 2005-2015 JOSM developers <josm-dev@openstreetmap.org>
+Copyright (c) 2005-2020 JOSM developers <josm-dev@openstreetmap.org>
 
 License: GPL3+
Index: /trunk/linux/tested/usr/share/mime/packages/josm.xml
===================================================================
--- /trunk/linux/tested/usr/share/mime/packages/josm.xml	(revision 15915)
+++ /trunk/linux/tested/usr/share/mime/packages/josm.xml	(revision 15915)
@@ -0,0 +1,18 @@
+<?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">
+                <sub-class-of type="application/xml"/>
+                <comment>OSM XML file</comment>
+                <glob pattern="*.osm"/>
+        </mime-type>
+        <mime-type type="application/x-josm-session+xml">
+                <sub-class-of type="application/xml"/>
+                <comment>JOSM session file</comment>
+                <glob pattern="*.jos"/>
+        </mime-type>
+        <mime-type type="application/x-josm-session+zip">
+                <sub-class-of type="application/zip"/>
+                <comment>JOSM session archive</comment>
+                <glob pattern="*.joz"/>
+        </mime-type>
+</mime-info>
Index: /trunk/macosx/JOSM.app/Contents/Info.plist_template.xml
===================================================================
--- /trunk/macosx/JOSM.app/Contents/Info.plist_template.xml	(revision 15914)
+++ /trunk/macosx/JOSM.app/Contents/Info.plist_template.xml	(revision 15915)
@@ -31,4 +31,28 @@
         </dict>
     </dict>
+    <!-- Export JOSM session file format UTI (*.jos) -->
+    <dict>
+        <key>UTTypeIdentifier</key>
+        <string>org.openstreetmap.josm.jos</string>
+        <key>UTTypeDescription</key>
+        <string>JOS File</string>
+        <key>UTTypeIconFile</key>
+        <string>JOSM.icns</string>
+        <key>UTTypeConformsTo</key>
+        <array>
+            <string>public.xml</string>
+        </array>
+        <key>UTTypeTagSpecification</key>
+        <dict>
+            <key>com.apple.ostype</key>
+            <string>JOSM</string>
+            <key>public.filename-extension</key>
+            <array>
+                <string>jos</string>
+            </array>
+            <key>public.mime-type</key>
+            <string>application/x-josm-session+xml</string>
+        </dict>
+    </dict>
     <!-- Export JOSM session file format UTI (*.joz) -->
     <dict>
@@ -51,4 +75,6 @@
                 <string>joz</string>
             </array>
+            <key>public.mime-type</key>
+            <string>application/x-josm-session+zip</string>
         </dict>
     </dict>
@@ -148,4 +174,19 @@
         </array>
     </dict>
+    <!-- Registers opening *.jos files -->
+    <dict>
+        <key>CFBundleTypeIconFile</key>
+        <string>JOSM.icns</string>
+        <key>CFBundleTypeName</key>
+        <string>JOS Files</string>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>LSHandlerRank</key>
+        <string>Owner</string>
+        <key>LSItemContentTypes</key>
+        <array>
+            <string>org.openstreetmap.josm.jos</string>
+        </array>
+    </dict>
     <!-- Registers opening *.joz files -->
     <dict>
Index: /trunk/windows/josm.nsi
===================================================================
--- /trunk/windows/josm.nsi	(revision 15914)
+++ /trunk/windows/josm.nsi	(revision 15915)
@@ -344,5 +344,11 @@
 	StrCpy $R0 ".osm"
   	Call Associate
+	StrCpy $R0 ".geojson"
+  	Call Associate
 	StrCpy $R0 ".gpx"
+  	Call Associate
+	StrCpy $R0 ".jos"
+  	Call Associate
+	StrCpy $R0 ".joz"
   	Call Associate
 ; if somethings added here, add it also to the uninstall section
@@ -402,5 +408,11 @@
 	StrCpy $R0 ".osm"
   	Call un.unlink
+	StrCpy $R0 ".geojson"
+  	Call un.unlink
 	StrCpy $R0 ".gpx"
+  	Call un.unlink
+	StrCpy $R0 ".jos"
+  	Call un.unlink
+	StrCpy $R0 ".joz"
   	Call un.unlink
 pop $R0