diff --git a/installer/install.xml b/installer/install.xml
index 1abfda98d..1141b17ba 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -106,7 +106,7 @@
               http://www.javalobby.org/forums/thread.jspa?threadID=15967&tstart=0
               and the izpack docs for some guidance.
              -->
-            <parsable targetfile="$INSTALL_PATH/wrapper.config" type="javaprop" />
+            <parsable targetfile="$INSTALL_PATH/wrapper.config" type="plain" />
             <parsable targetfile="$INSTALL_PATH/i2prouter" type="shell" os="unix|mac" />
             <parsable targetfile="$INSTALL_PATH/eepget" type="shell" os="unix|mac" />
             <parsable targetfile="$INSTALL_PATH/runplain.sh" type="shell" os="unix|mac" />
diff --git a/installer/resources/wrapper.config b/installer/resources/wrapper.config
index 03efe22fb..b9e446092 100644
--- a/installer/resources/wrapper.config
+++ b/installer/resources/wrapper.config
@@ -51,7 +51,8 @@ wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
 wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
 wrapper.java.additional.3=-Dorg.mortbay.util.FileResource.checkAliases=false
 wrapper.java.additional.4=-Dorg.mortbay.xml.XmlParser.NotValidating=true
-wrapper.java.additional.5=-Di2p.dir.base=$INSTALL_PATH
+wrapper.java.additional.5=-Di2p.dir.base="$INSTALL_PATH"
+wrapper.java.additional.5.stripquotes=TRUE
 # Uncomment this for better performance.
 # If it doesn't work, server mode is not available in your JVM.
 # This may not be required if your machine is already "server-class".