diff --git a/history.txt b/history.txt
index 73249af09..dea82d9f2 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,9 @@
 2012-03-09 zzz
+  * Update default eepsite base context to use DefaultServlet
+    instead of ResourceHandler, to provide resume, directory
+    indexes, caching, etc.
+
+2012-03-08 zzz
   * GarlicConfig: Remove unused reply block methods
   * SessionKeyManager:
     - Don't use unacked tagsets after consecutive ack failures
diff --git a/installer/resources/eepsite/contexts/base-context.xml b/installer/resources/eepsite/contexts/base-context.xml
index 1eac07330..78c7b7295 100644
--- a/installer/resources/eepsite/contexts/base-context.xml
+++ b/installer/resources/eepsite/contexts/base-context.xml
@@ -12,13 +12,17 @@ to serve static html files and images.
   <Set name="contextPath">/</Set>
   <Set name="resourceBase">./eepsite/docroot/</Set>
   <Set name="handler">
-    <New class="org.mortbay.jetty.handler.ResourceHandler">
-      <Set name="welcomeFiles">
-        <Array type="String">
-          <Item>index.html</Item>
-        </Array>
-      </Set>
-      <Set name="cacheControl">max-age=3600,public</Set>
+    <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>
 </Configure>
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index fecba78d6..a6204817e 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 = 7;
+    public final static long BUILD = 8;
 
     /** for example "-test" */
     public final static String EXTRA = "";