Index: /applications/editors/josm/nsis/josm-setup-unix.sh
===================================================================
--- /applications/editors/josm/nsis/josm-setup-unix.sh	(revision 5213)
+++ /applications/editors/josm/nsis/josm-setup-unix.sh	(revision 5214)
@@ -20,5 +20,5 @@
 
 #export VERSION=latest
-export VERSION=custom-${svnrevision}
+export VERSION=custom-${svnrevision}                                         
 
 echo "Creating Windows Installer for josm-$VERSION"
@@ -43,20 +43,4 @@
 fi
 
-
-echo 
-echo "##################################################################"
-echo "### Copy the required Stuff into the download Directory"
-mkdir -p downloads
-( 
-    cd downloads
-    
-    # get latest josm version (and license)
-    cp ../../core/LICENSE LICENSE
-    cp ../../core/dist/josm-custom.jar josm-latest.jar
-    
-    # Get all plugins
-    cp ../../plugins/dist/*.jar .
-)
-
 echo 
 echo "##################################################################"
@@ -78,2 +62,5 @@
 # apt-get install nsis
 makensis -V2 -DVERSION=$VERSION josm.nsi
+
+# delete the intermediate file, just to avoid confusion
+rm josm.exe
Index: /applications/editors/josm/nsis/josm-setup.sh
===================================================================
--- /applications/editors/josm/nsis/josm-setup.sh	(revision 5213)
+++ /applications/editors/josm/nsis/josm-setup.sh	(revision 5214)
@@ -9,29 +9,4 @@
 LAUNCH4J_XML="C:\Dokumente und Einstellungen\ulfl\Eigene Dateien\svn.openstreetmap.org\applications\editors\josm\nsis\launch4j.xml"
 
-
-### download required files ###
-mkdir -p downloads
-cd downloads
-
-# get latest josm version (and license)
-wget -N http://josm.openstreetmap.de/download/josm-latest.jar
-wget -N http://josm.openstreetmap.de/browser/trunk/LICENSE?format=raw
-cp LICENSE?format=raw LICENSE
-
-# get latest plugin (and supporting files) versions
-#cp ../../plugins/annotation-tester/annotation-tester.jar .
-#wget -N http://josm.openstreetmap.de/download/plugins/tagging-preset-tester.jar
-cp ../../plugins/dist/mappaint.jar .
-# wget -N http://svn.openstreetmap.org/applications/editors/josm/plugins/mappaint/mappaint.jar
-cp ../../plugins/dist/namefinder.jar .
-# wget --N http://svn.openstreetmap.org/applications/editors/josm/plugins/namefinder/namefinder.jar
-#cp ../../plugins/osmarender/osmarender.jar .
-#wget -N http://josm.openstreetmap.de/download/plugins/osmarender.jar
-cp ../../plugins/dist/validator.jar .
-#wget -N http://personales.ya.com/osmfrsantos/validator/latest/validator.jar
-cp ../../plugins/dist/wmsplugin.jar .
-#wget -N http://chippy2005.googlepages.com/wmsplugin.jar
-
-cd ..
 
 ### convert jar to exe ###
@@ -48,2 +23,5 @@
 # NSIS - http://nsis.sourceforge.net/Main_Page
 "$PROGRAM_FILES/nsis/makensis.exe" /DVERSION=$VERSION josm.nsi
+
+# delete the intermediate file, just to avoid confusion
+rm josm.exe
Index: /applications/editors/josm/nsis/josm.nsi
===================================================================
--- /applications/editors/josm/nsis/josm.nsi	(revision 5213)
+++ /applications/editors/josm/nsis/josm.nsi	(revision 5214)
@@ -83,5 +83,5 @@
 
 !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "downloads\LICENSE"
+!insertmacro MUI_PAGE_LICENSE "..\core\LICENSE"
 !insertmacro MUI_PAGE_COMPONENTS
 ;Page custom DisplayAdditionalTasksPage
@@ -321,5 +321,5 @@
 SetShellVarContext all
 SetOutPath $APPDATA\JOSM\plugins
-File "downloads\mappaint.jar"
+File "..\plugins\dist\mappaint.jar"
 SectionEnd
 
@@ -342,5 +342,5 @@
 SetShellVarContext all
 SetOutPath $APPDATA\JOSM\plugins
-File "downloads\wmsplugin.jar"
+File "..\plugins\dist\wmsplugin.jar"
 SectionEnd
 
@@ -350,5 +350,5 @@
 SetShellVarContext all
 SetOutPath $APPDATA\JOSM\plugins
-File "downloads\namefinder.jar"
+File "..\plugins\dist\namefinder.jar"
 SectionEnd
 
@@ -358,5 +358,5 @@
 SetShellVarContext all
 SetOutPath $APPDATA\JOSM\plugins
-File "downloads\validator.jar"
+File "..\plugins\dist\validator.jar"
 SectionEnd
 
Index: /applications/editors/josm/nsis/launch4j.xml
===================================================================
--- /applications/editors/josm/nsis/launch4j.xml	(revision 5213)
+++ /applications/editors/josm/nsis/launch4j.xml	(revision 5214)
@@ -2,5 +2,5 @@
   <dontWrapJar>false</dontWrapJar>
   <headerType>0</headerType>
-  <jar>downloads/josm-latest.jar</jar>
+  <jar>../core/dist/josm-custom.jar</jar>
   <outfile>josm.exe</outfile>
   <errTitle></errTitle>