Index: /applications/editors/josm/nsis/josm-setup-unix.sh
===================================================================
--- /applications/editors/josm/nsis/josm-setup-unix.sh	(revision 14188)
+++ /applications/editors/josm/nsis/josm-setup-unix.sh	(revision 14189)
@@ -14,6 +14,15 @@
 
 ## settings ##
-LAUNCH4J="java -jar /usr/share/launch4j/launch4j.jar"
-MAKENSIS=makensis
+
+if [ -s /cygdrive/c/Programme/Launch4j/launch4jc.exe ]; then
+	echo Using paths: "C:\Programme\..."
+	LAUNCH4J="/cygdrive/c/Programme/Launch4j/launch4jc.exe"
+	MAKENSIS="/cygdrive/c/Programme/nsis/makensis.exe"
+elif [ -s josm.exe ]; then
+	echo Using UNIX-like paths
+	LAUNCH4J="java -jar /usr/share/launch4j/launch4j.jar"
+	MAKENSIS=makensis
+fi
+
 
 svncorerevision=`svnversion ../core`
@@ -26,6 +35,16 @@
 echo "Creating Windows Installer for josm-$VERSION"
 
-##################################################################
-### Build the Complete josm + Plugin Stuff
+echo 
+echo "##################################################################"
+echo "### Download and unzip the webkit stuff"
+wget -nc http://josm.openstreetmap.de/download/windows/webkit-image.zip
+mkdir -p webkit-image
+cd webkit-image
+unzip -o ../webkit-image.zip
+cd ..
+
+echo 
+echo "##################################################################"
+echo "### Build the Complete josm + Plugin Stuff"
 if true; then
     (
Index: /applications/editors/josm/nsis/josm-setup.sh
===================================================================
--- /applications/editors/josm/nsis/josm-setup.sh	(revision 14188)
+++ /applications/editors/josm/nsis/josm-setup.sh	(revision 14189)
@@ -14,6 +14,15 @@
 
 ## settings ##
-LAUNCH4J="/cygdrive/c/Programme/Launch4j/launch4jc.exe"
-MAKENSIS="/cygdrive/c/Programme/nsis/makensis.exe"
+
+if [ -s /cygdrive/c/Programme/Launch4j/launch4jc.exe ]; then
+	echo Using paths: "C:\Programme\..."
+	LAUNCH4J="/cygdrive/c/Programme/Launch4j/launch4jc.exe"
+	MAKENSIS="/cygdrive/c/Programme/nsis/makensis.exe"
+elif [ -s josm.exe ]; then
+	echo Using UNIX-like paths
+	LAUNCH4J="java -jar /usr/share/launch4j/launch4j.jar"
+	MAKENSIS=makensis
+fi
+
 
 svncorerevision=`svnversion ../core`
@@ -26,6 +35,16 @@
 echo "Creating Windows Installer for josm-$VERSION"
 
-##################################################################
-### Build the Complete josm + Plugin Stuff
+echo 
+echo "##################################################################"
+echo "### Download and unzip the webkit stuff"
+wget -nc http://josm.openstreetmap.de/download/windows/webkit-image.zip
+mkdir -p webkit-image
+cd webkit-image
+unzip -o ../webkit-image.zip
+cd ..
+
+echo 
+echo "##################################################################"
+echo "### Build the Complete josm + Plugin Stuff"
 if true; then
     (
Index: /applications/editors/josm/nsis/josm.nsi
===================================================================
--- /applications/editors/josm/nsis/josm.nsi	(revision 14188)
+++ /applications/editors/josm/nsis/josm.nsi	(revision 14189)
@@ -361,4 +361,13 @@
 SetOutPath $APPDATA\JOSM\plugins
 File "..\dist\wmsplugin.jar"
+SetOutPath $INSTDIR\webkit-image\imageformats
+File "webkit-image\imageformats\qjpeg4.dll"
+SetOutPath $INSTDIR\webkit-image
+File "webkit-image\mingwm10.dll"
+File "webkit-image\QtCore4.dll"
+File "webkit-image\QtGui4.dll"
+File "webkit-image\QtNetwork4.dll"
+File "webkit-image\QtWebKit4.dll"
+File "webkit-image\webkit-image.exe"
 SectionEnd