Index: linux/latest/usr/share/applications/josm-latest.desktop
===================================================================
--- linux/latest/usr/share/applications/josm-latest.desktop	(revision 8840)
+++ linux/latest/usr/share/applications/josm-latest.desktop	(working copy)
@@ -4,10 +4,11 @@
 Name=JOSM (latest snapshot)
 GenericName=Java OpenStreetMap Editor (latest)
 Comment=Extensible off-line editor for OpenStreetMap (OSM)
-Icon=josm-latest.png
+Icon=josm-latest
 Exec=josm-latest %F
 Terminal=false
-MimeType=application/x-osm+xml;application/x-gpx+xml
+MimeType=application/x-osm+xml;application/x-gpx+xml;
 StartupNotify=true
-Categories=Education;Geoscience;Maps
+Categories=Education;Geoscience;Maps;
 StartupWMClass=org-openstreetmap-josm-Main
+Keywords=OpenStreetMap;OSM;
Index: linux/tested/usr/share/applications/josm.desktop
===================================================================
--- linux/tested/usr/share/applications/josm.desktop	(revision 8840)
+++ linux/tested/usr/share/applications/josm.desktop	(working copy)
@@ -4,10 +4,11 @@
 Name=JOSM
 GenericName=Java OpenStreetMap Editor
 Comment=Extensible off-line editor for OpenStreetMap (OSM)
-Icon=josm.png
+Icon=josm
 Exec=josm %F
 Terminal=false
-MimeType=application/x-osm+xml;application/x-gpx+xml
+MimeType=application/x-osm+xml;application/x-gpx+xml;
 StartupNotify=true
-Categories=Education;Geoscience;Maps
+Categories=Education;Geoscience;Maps;
 StartupWMClass=org-openstreetmap-josm-Main
+Keywords=OpenStreetMap;OSM;