Index: trunk/native/windows/win-jpackage.sh
===================================================================
--- trunk/native/windows/win-jpackage.sh	(revision 18525)
+++ trunk/native/windows/win-jpackage.sh	(revision 18801)
@@ -38,5 +38,5 @@
 #sed -i "s|%josm-source-dir%|$(pwd)|g" native/windows/main.wxs
 cp native/windows/main.wxs native/windows/main.wxs.bak
-sed -i 's?%josm-source-dir%?'`pwd`'?' native/windows/main.wxs
+sed -i "s?%josm-source-dir%?$(pwd)?" native/windows/main.wxs
 sed -i 's?"/c/?"c:/?g' native/windows/main.wxs
 sed -i 's?"/d/?"d:/?g' native/windows/main.wxs
@@ -47,5 +47,5 @@
 for type in exe msi
 do
-    jpackage $JPACKAGEOPTIONS -n "JOSM" --input dist --main-jar josm-custom.jar \
+    jpackage "$JPACKAGEOPTIONS" -n "JOSM" --input dist --main-jar josm-custom.jar \
     --main-class org.openstreetmap.josm.gui.MainApplication \
     --icon ./native/windows/logo.ico --type $type --dest app \
@@ -86,6 +86,6 @@
 mv native/windows/main.wxs.bak native/windows/main.wxs
 
-mv app/JOSM-1.5.$1.exe app/JOSM.exe
-mv app/JOSM-1.5.$1.msi app/JOSM.msi
+mv app/JOSM-1.5."$1".exe app/JOSM.exe
+mv app/JOSM-1.5."$1".msi app/JOSM.msi
 
 # Workaround to https://bugs.openjdk.java.net/browse/JDK-8261845