Index: /trunk/windows/josm-setup-unix.sh
===================================================================
--- /trunk/windows/josm-setup-unix.sh	(revision 7839)
+++ /trunk/windows/josm-setup-unix.sh	(revision 7840)
@@ -64,5 +64,5 @@
   export JOSM_BUILD="yes"
   export WEBKIT_DOWNLOAD="yes"
-  export JOSM_FILE="..\core\dist\josm-custom.jar"
+  export JOSM_FILE="..\dist\josm-custom.jar"
 fi
 
Index: /trunk/windows/josm.nsi
===================================================================
--- /trunk/windows/josm.nsi	(revision 7839)
+++ /trunk/windows/josm.nsi	(revision 7840)
@@ -64,5 +64,5 @@
 
 !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "..\core\LICENSE"
+!insertmacro MUI_PAGE_LICENSE "..\LICENSE"
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
@@ -430,6 +430,4 @@
 Delete "$APPDATA\JOSM\plugins\turnrestrictions\*.*"
 RMDir "$APPDATA\JOSM\plugins\turnrestrictions"
-Delete "$APPDATA\JOSM\plugins\openstreetbugs\*.*"
-RMDir "$APPDATA\JOSM\plugins\openstreetbugs"
 Delete "$APPDATA\JOSM\plugins\*.*"
 RMDir "$APPDATA\JOSM\plugins"