Index: applications/nsis/README.txt
===================================================================
--- applications/nsis/README.txt	(revision 2768)
+++ applications/nsis/README.txt	(revision 2786)
@@ -3,6 +3,7 @@
 default preferences for Windows users.
 
-Currently only josm is included in the installer. Probably, other osm related 
-applications like osmarender and mapnik will be added later.
+Currently only josm and a small assortment of josm plugins is included in the 
+installer. Probably, other osm related applications like osmarender and mapnik 
+will be added later.
 
 
Index: applications/nsis/openstreetmap-setup.sh
===================================================================
--- applications/nsis/openstreetmap-setup.sh	(revision 2768)
+++ applications/nsis/openstreetmap-setup.sh	(revision 2786)
@@ -1,3 +1,12 @@
 #!/bin/sh
+
+## settings ##
+
+VERSION=0.0.6
+
+PROGRAM_FILES="/cygdrive/c/Program Files"
+
+LAUNCH4J_XML="C:\Dokumente und Einstellungen\ulfl\Eigene Dateien\proj\gps\osm\svn.openstreetmap.org\applications\nsis\launch4j.xml"
+
 
 ### download required files ###
@@ -11,9 +20,10 @@
 
 # get latest plugin (and supporting files) versions
-wget -nc http://www.free-map.org.uk/downloads/josm/mappaint.jar
-wget -nc http://www.free-map.org.uk/downloads/josm/elemstyles.xml
+wget -nc http://svn.openstreetmap.org/applications/editors/josm/plugins/mappaint/
+# wget -nc http://www.free-map.org.uk/downloads/josm/mappaint.jar
+# wget -nc http://www.free-map.org.uk/downloads/josm/elemstyles.xml
 wget -nc http://www.eigenheimstrasse.de/josm/plugins/osmarender.jar
+wget -nc http://www.eigenheimstrasse.de/josm/plugins/annotation-tester.jar
 wget -nc http://chippy2005.googlepages.com/wmsplugin.jar
-wget -nc http://www.eigenheimstrasse.de/josm/plugins/annotation-tester.jar
 
 cd ..
@@ -22,7 +32,7 @@
 # (makes attaching to file extensions a lot easier)
 # launch4j - http://launch4j.sourceforge.net/
-"/cygdrive/c/Program Files/Launch4j/launch4jc.exe" "C:\Dokumente und Einstellungen\ulfl\Eigene Dateien\proj\gps\osm\nsis\launch4j.xml"
+"$PROGRAM_FILES/Launch4j/launch4jc.exe" "$LAUNCH4J_XML"
 
 ### create the installer exe ###
 # NSIS - http://nsis.sourceforge.net/Main_Page
-"/cygdrive/c/Program Files/nsis/makensis.exe" openstreetmap.nsi
+"$PROGRAM_FILES/nsis/makensis.exe" /DVERSION=$VERSION openstreetmap.nsi
Index: applications/nsis/openstreetmap.nsi
===================================================================
--- applications/nsis/openstreetmap.nsi	(revision 2768)
+++ applications/nsis/openstreetmap.nsi	(revision 2786)
@@ -14,5 +14,4 @@
 !include "INIStrNS.nsh"
 
-!define VERSION "0.0.5"
 !define DEST "openstreetmap"
 
@@ -369,6 +368,6 @@
 SetOutPath $APPDATA\JOSM\plugins
 File "downloads\mappaint.jar"
-SetOutPath $APPDATA\JOSM\plugins\mappaint
-File "downloads\elemstyles.xml"
+;SetOutPath $APPDATA\JOSM\plugins\mappaint
+;File "downloads\elemstyles.xml"
 SectionEnd
 
@@ -457,7 +456,7 @@
 Delete "$APPDATA\JOSM\plugins\osmarender\*.*"
 Delete "$APPDATA\JOSM\plugins\mappaint.jar"
-Delete "$APPDATA\JOSM\plugins\mappaint\elemstyles.xml"
+;Delete "$APPDATA\JOSM\plugins\mappaint\elemstyles.xml"
 RMDir "$APPDATA\JOSM\plugins\osmarender"
-RMDir "$APPDATA\JOSM\plugins\mappaint"
+;RMDir "$APPDATA\JOSM\plugins\mappaint"
 RMDir "$APPDATA\JOSM\plugins"
 RMDir "$APPDATA\JOSM"