Index: applications/editors/josm/nsis/josm.nsi
===================================================================
--- applications/editors/josm/nsis/josm.nsi	(revision 5120)
+++ applications/editors/josm/nsis/josm.nsi	(revision 5122)
@@ -294,7 +294,8 @@
 
 ; don't overwrite existing de_streets.xml file
-IfFileExists de-streets.xml dont_overwrite_de_streets
-File "de-streets.xml"
-dont_overwrite_de_streets:
+; in the meantime, JOSM provides a basic set of tagging presets - don't provide our own
+;IfFileExists de-streets.xml dont_overwrite_de_streets
+;File "de-streets.xml"
+;dont_overwrite_de_streets:
 
 ; write reasonable defaults for some preferences
@@ -309,5 +310,5 @@
 ${WriteINIStrNS} $R0 "$APPDATA\JOSM\preferences" "projection" "org.openstreetmap.josm.data.projection.Epsg4326"
 ${WriteINIStrNS} $R0 "$APPDATA\JOSM\preferences" "osm-server.url" "http://www.openstreetmap.org/api"
-${WriteINIStrNS} $R0 "$APPDATA\JOSM\preferences" "taggingpreset.sources" "$APPDATA/JOSM/de-streets.xml"
+;${WriteINIStrNS} $R0 "$APPDATA\JOSM\preferences" "taggingpreset.sources" "$APPDATA/JOSM/de-streets.xml"
 SectionEnd
 
@@ -324,4 +325,6 @@
 
 ;Section "osmarender" SecOsmarenderPlugin
+; osmarender needs Firefox (which isn't available on all machines)
+; and often provides clipped SVG graphics - therefore it's ommited by default
 ;-------------------------------------------
 ;SectionIn 1 2
@@ -490,5 +493,5 @@
 Delete "$APPDATA\JOSM\preferences"
 Delete "$APPDATA\JOSM\bookmarks"
-Delete "$APPDATA\JOSM\de-streets.xml"
+;Delete "$APPDATA\JOSM\de-streets.xml"
 RMDir "$APPDATA\JOSM"
 RMDir "$APPDATA\JOSM\plugins\mappaint"