diff --git a/installer/resources/clients.config b/installer/resources/clients.config
index 8dc657338..cd68fb5c0 100644
--- a/installer/resources/clients.config
+++ b/installer/resources/clients.config
@@ -40,7 +40,7 @@ clientApp.2.args=i2ptunnel.config
 clientApp.2.startOnLoad=true
 
 # run our own eepsite with a seperate jetty instance
-clientApp.3.main=org.mortbay.start.Main
+clientApp.3.main=net.i2p.jetty.JettyStart
 clientApp.3.name=I2P webserver (eepsite)
 ## To use the rewrite handler, edit jetty-rewrite.xml and use:
 #clientApp.3.args="/path/to/jetty.xml" "/path/to/jetty-rewrite.xml"
diff --git a/installer/resources/eepsite/jetty.xml b/installer/resources/eepsite/jetty.xml
index 0d4ef27cb..7a57fa3fc 100644
--- a/installer/resources/eepsite/jetty.xml
+++ b/installer/resources/eepsite/jetty.xml
@@ -74,8 +74,8 @@
            See RouterConsoleRunner.
        -->
       <New class="org.eclipse.jetty.util.thread.ExecutorThreadPool">
-        <!-- corePoolSize (must be at least 2) -->
-        <Arg type="int">2</Arg>
+        <!-- corePoolSize (must be at least 3) -->
+        <Arg type="int">3</Arg>
         <!-- maximumPoolSize -->
         <Arg type="int">16</Arg>
         <!-- keepAliveTime (milliseconds) -->