Index: plications/editors/josm/nsis/bookmarks
===================================================================
--- /applications/editors/josm/nsis/bookmarks	(revision 27238)
+++ 	(revision )
@@ -1,12 +1,0 @@
-D - München (Munich / Minga),48.11058737566372,11.527800592723699,48.17294169306785,11.601615007276303
-D - Nürnberg (Nuremberg / Nämberch),49.44270752024581,11.063412303146514,49.465701925909535,11.090632849577194
-D - Mainz,49.58,8.14,49.6,8.16
-D - Erlangen,49.53530551899356,10.893663089997254,49.64013443292672,11.07554098888691
-D - Ingolstadt,48.615608086215175,11.232933428311759,48.893652866507985,11.728832483590338
-F - Paris,48.8357384630452,2.3224969899162486,48.873105378661435,2.366731569247336
-GB - Edinburgh,55.92398899551622,-3.224983983067846,55.97629637675515,-3.1630630306194685
-GB - Isle of Wight,50.615920250817595,-1.3924414296431702,50.77406537385863,-1.205230821659658
-GB - London,51.488459848353145,-0.12913583060590134,51.5303607711691,-0.0795339390988775
-GBX - Isle of Man,54.13417832310719,-4.5995930818092425,54.35961532959686,-4.332723018190757
-I - Milano,45.44997662732742,9.173075349203543,45.48339250782299,9.21263273284956
-NL - Amsterdam,52.360857534001966,4.874898898306392,52.39861686402203,4.9195980138666675
Index: /applications/editors/josm/nsis/josm.nsi
===================================================================
--- /applications/editors/josm/nsis/josm.nsi	(revision 27238)
+++ /applications/editors/josm/nsis/josm.nsi	(revision 27239)
@@ -290,9 +290,4 @@
 SetShellVarContext current
 SetOutPath "$APPDATA\JOSM"
-
-; don't overwrite existing bookmarks
-IfFileExists preferences dont_overwrite_bookmarks
-File "bookmarks"
-dont_overwrite_bookmarks:
 
 SectionEnd
@@ -463,4 +458,5 @@
 Delete "$APPDATA\JOSM\motd.html"
 Delete "$APPDATA\JOSM\preferences"
+Delete "$APPDATA\JOSM\preferences.xml"
 Delete "$APPDATA\JOSM\bookmarks"
 RMDir "$APPDATA\JOSM"