diff --git a/history.txt b/history.txt
index dea82d9f2..ab41fb7a2 100644
--- a/history.txt
+++ b/history.txt
@@ -2,6 +2,8 @@
   * Update default eepsite base context to use DefaultServlet
     instead of ResourceHandler, to provide resume, directory
     indexes, caching, etc.
+  * Simplify default eepsite base and CGI contexts to use a Context
+    instead of a ContextHolder, ServletHandler, and ServletHolder
 
 2012-03-08 zzz
   * GarlicConfig: Remove unused reply block methods
diff --git a/installer/resources/eepsite/contexts/base-context.xml b/installer/resources/eepsite/contexts/base-context.xml
index 78c7b7295..327dc73c2 100644
--- a/installer/resources/eepsite/contexts/base-context.xml
+++ b/installer/resources/eepsite/contexts/base-context.xml
@@ -4,26 +4,16 @@
 <!--
 Configure a custom context for the eepsite.
 
-This context contains only a ServletHandler with a default servlet
+This context contains only a Context with a default servlet
 to serve static html files and images.
 -->
 
-<Configure class="org.mortbay.jetty.handler.ContextHandler">
+<Configure class="org.mortbay.jetty.servlet.Context">
   <Set name="contextPath">/</Set>
   <Set name="resourceBase">./eepsite/docroot/</Set>
-  <Set name="handler">
-    <New class="org.mortbay.jetty.servlet.ServletHandler" >
-      <Call name="addServletWithMapping">
-        <Arg>
-          <New class="org.mortbay.jetty.servlet.ServletHolder">
-            <Arg>
-              <New class="org.mortbay.jetty.servlet.DefaultServlet" />
-            </Arg>
-          </New>
-        </Arg>
-        <Arg>/</Arg>
-      </Call>
-    </New>
-  </Set>
+  <Call name="addServlet">
+    <Arg>org.mortbay.jetty.servlet.DefaultServlet</Arg>
+    <Arg>/</Arg>
+  </Call>
 </Configure>
 
diff --git a/installer/resources/eepsite/contexts/cgi-context.xml b/installer/resources/eepsite/contexts/cgi-context.xml
index 77126f5a5..4a0b0b6d2 100644
--- a/installer/resources/eepsite/contexts/cgi-context.xml
+++ b/installer/resources/eepsite/contexts/cgi-context.xml
@@ -22,25 +22,21 @@ Configure a custom context for the eepsite.
  * parameter value.
 -->
 
-<Configure class="org.mortbay.jetty.handler.ContextHandler">
+<Configure class="org.mortbay.jetty.servlet.Context">
   <Set name="contextPath">/cgi-bin</Set>
   <Set name="resourceBase">./eepsite/cgi-bin/</Set>
-  <Set name="handler">
-    <New class="org.mortbay.jetty.servlet.ServletHandler" >
-      <Call name="addServletWithMapping">
-        <Arg>
-          <New class="org.mortbay.jetty.servlet.ServletHolder">
-            <Arg>
-              <New class="org.mortbay.servlet.CGI" />
-            </Arg>
-            <Call name="setInitParameter">
-              <Arg>Path</Arg>
-              <Arg>/usr/local/bin:/bin:/usr/bin</Arg>
-            </Call>
-          </New>
-        </Arg>
-        <Arg>/</Arg>
-      </Call>
-    </New>
-  </Set>
+  <Call name="setInitParams">
+    <Arg>
+      <Map>
+        <Entry>
+          <Item>Path</Item>
+          <Item>/usr/local/bin:/bin:/usr/bin</Item>
+        </Entry>
+      </Map>
+    </Arg>
+  </Call>
+  <Call name="addServlet">
+    <Arg>org.mortbay.servlet.CGI</Arg>
+    <Arg>/</Arg>
+  </Call>
 </Configure>
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index a6204817e..f2522cd4e 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 8;
+    public final static long BUILD = 9;
 
     /** for example "-test" */
     public final static String EXTRA = "";