Index: applications/editors/josm/nsis/josm.nsi
===================================================================
--- applications/editors/josm/nsis/josm.nsi	(revision 27237)
+++ 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"