Index: /applications/editors/josm/nsis/josm.nsi
===================================================================
--- /applications/editors/josm/nsis/josm.nsi	(revision 17699)
+++ /applications/editors/josm/nsis/josm.nsi	(revision 17700)
@@ -288,4 +288,5 @@
 SetOutPath $INSTDIR
 File "josm.exe"
+File "..\core\dist\josm-custom.jar"
 
 ; XXX - should be provided/done by josm.jar itself and not here!
@@ -427,9 +428,10 @@
 SetShellVarContext current
 
-Delete "$INSTDIR\josm.exe"
+Delete "$INSTDIR\josm-custom.jar"
 IfErrors 0 NoJOSMErrorMsg
-	MessageBox MB_OK $(un.JOSM_IN_USE_ERROR) IDOK 0 ;skipped if josm.exe removed
+	MessageBox MB_OK $(un.JOSM_IN_USE_ERROR) IDOK 0 ;skipped if josm.jar removed
 	Abort $(un.JOSM_IN_USE_ERROR)
 NoJOSMErrorMsg:
+Delete "$INSTDIR\josm.exe"
 Delete "$INSTDIR\imageformats\qjpeg4.dll"
 RMDir "$INSTDIR\imageformats"
Index: /applications/editors/josm/nsis/launch4j.xml
===================================================================
--- /applications/editors/josm/nsis/launch4j.xml	(revision 17699)
+++ /applications/editors/josm/nsis/launch4j.xml	(revision 17700)
@@ -1,6 +1,6 @@
 <launch4jConfig>
-  <dontWrapJar>false</dontWrapJar>
+  <dontWrapJar>true</dontWrapJar>
   <headerType>0</headerType>
-  <jar>../core/dist/josm-custom.jar</jar>
+  <jar>josm-custom.jar</jar>
   <outfile>josm.exe</outfile>
   <errTitle></errTitle>
Index: /applications/editors/josm/nsis/locale/english.nsh
===================================================================
--- /applications/editors/josm/nsis/locale/english.nsh	(revision 17699)
+++ /applications/editors/josm/nsis/locale/english.nsh	(revision 17700)
@@ -48,5 +48,5 @@
 !insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_FULL_UNINSTALL "All (remove all)"
 
-!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_IN_USE_ERROR "Please note: josm.exe could not be removed, it's probably in use!"
+!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_IN_USE_ERROR "Please note: josm could not be removed, it's probably in use!"
 !insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_INSTDIR_ERROR "Please note: The directory $INSTDIR could not be removed!"
 
Index: /applications/editors/josm/nsis/locale/german.nsh
===================================================================
--- /applications/editors/josm/nsis/locale/german.nsh	(revision 17699)
+++ /applications/editors/josm/nsis/locale/german.nsh	(revision 17700)
@@ -45,5 +45,5 @@
 !insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_FULL_UNINSTALL "Alles (alles entfernen)"
 
-!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_IN_USE_ERROR "Achtung: josm.exe konnte nicht entfernt werden, möglicherweise wird es noch benutzt!"
+!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_IN_USE_ERROR "Achtung: josm konnte nicht entfernt werden, möglicherweise wird es noch benutzt!"
 !insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_INSTDIR_ERROR "Achtung: Das Verzeichnis $INSTDIR konnte nicht entfernt werden!"