diff --git a/installer/resources/clients.config b/installer/resources/clients.config
index 88bba5f9a8..daa698908d 100644
--- a/installer/resources/clients.config
+++ b/installer/resources/clients.config
@@ -20,7 +20,7 @@ clientApp.2.startOnLoad=true
 # run our own eepsite with a seperate jetty instance
 clientApp.3.main=org.mortbay.jetty.Server
 clientApp.3.name=My eepsite web server
-clientApp.3.args=eepsite/jetty.xml
+clientApp.3.args="eepsite/jetty.xml"
 clientApp.3.delay=30
 clientApp.3.startOnLoad=true
 
diff --git a/router/java/src/net/i2p/router/startup/WorkingDir.java b/router/java/src/net/i2p/router/startup/WorkingDir.java
index 928a741523..e124727d92 100644
--- a/router/java/src/net/i2p/router/startup/WorkingDir.java
+++ b/router/java/src/net/i2p/router/startup/WorkingDir.java
@@ -195,8 +195,10 @@ public class WorkingDir {
             out.println("# Modified by I2P User dir migration script");
             String s = null;
             while ((s = DataHelper.readLine(in)) != null) {
-                if (s.endsWith("=eepsite/jetty.xml")) {
-                    s = s.replace("=eepsite", '=' + todir.getAbsolutePath() + File.separatorChar + "eepsite");
+                if (s.endsWith("=\"eepsite/jetty.xml\"")) {
+                    s = s.replace("=\"eepsite/jetty.xml\"", "=\"" + todir.getAbsolutePath() +
+                                                            File.separatorChar + "eepsite" +
+                                                            File.separatorChar + "jetty.xml\"");
                 }
                 out.println(s);
             }