diff --git a/apps/i2psnark/jetty-i2psnark.xml b/apps/i2psnark/jetty-i2psnark.xml
index 0d4c56112..b5d6d1ef8 100644
--- a/apps/i2psnark/jetty-i2psnark.xml
+++ b/apps/i2psnark/jetty-i2psnark.xml
@@ -58,6 +58,23 @@
     <Arg>webapps/i2psnark.war</Arg>
   </Call>
 
+  <!-- this is so we can find the css -->
+  <Call name="addContext">
+    <Arg>
+      <New class="org.mortbay.http.HttpContext">
+        <Set name="contextPath">/themes</Set>
+        <Set name="resourceBase">./docs/themes</Set>
+        <Call name="addHandler">
+          <Arg>
+            <New class="org.mortbay.http.handler.ResourceHandler">
+              <Set name="redirectWelcome">FALSE</Set>
+	    </New>
+          </Arg>
+        </Call>
+      </New>
+    </Arg>
+  </Call>
+  
   <!-- =============================================================== -->
   <!-- Configure the Other Server Options                              -->
   <!-- =============================================================== -->
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index a334e11b9..133376d13 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="all" name="jetty">
 
-    <property name="jetty.sha1" value="021164f84da7304bd1ff07c268b45aa3e0b13322" />
-    <property name="jetty.md5" value="a61adc832be6baf2678935506743cfc3" />
-    <property name="jetty.url" value="http://dist.codehaus.org/jetty/jetty-5.1.x/jetty-5.1.12.zip" />
-    <property name="jetty.filename" value="jetty-5.1.12.zip" />
+    <property name="jetty.base" value="jetty-5.1.15" />
+    <property name="jetty.sha1" value="3a7a3de50f86f0cdb23c33aec632ea7f44132c5e" />
+    <property name="jetty.filename" value="${jetty.base}.tgz" />
+    <property name="jetty.url" value="http://dist.codehaus.org/jetty/jetty-5.1.x/${jetty.filename}" />
     <property name="verified.filename" value="verified.txt" />
     <property name="javac.compilerargs" value="" />
 
@@ -32,7 +32,6 @@
         <echo message="Even if you deploy the Jetty archive manually, the build script will" />
         <echo message="still attempt to verify its checksums, which must be:" />
         <echo message="SHA1 ${jetty.sha1}" />
-        <echo message="MD5 ${jetty.md5}" />
         <echo message="" />
         <input message="Download Jetty archive automatically?" validargs="y,n" addproperty="jetty.download" />
         <fail message="Aborting as requested. Please deploy the Jetty archive manually." >
@@ -47,12 +46,9 @@
 
     <target name="verifyJettylib" unless="verified.already" >
         <condition property="jetty.zip.verified" >
-            <and>
                 <checksum file="${jetty.filename}" algorithm="SHA" property="${jetty.sha1}" />
-                <checksum file="${jetty.filename}" algorithm="MD5" property="${jetty.md5}" />
-            </and>
         </condition>
-        <fail message="Jetty archive does not match its checksums!" >
+        <fail message="Jetty archive does not match its checksum!" >
             <condition>
                 <not>
                     <istrue value="${jetty.zip.verified}" />
@@ -63,15 +59,16 @@
     </target>
 
     <target name="extractJettylib" unless="jetty.zip.extracted" >
-        <unzip src="${jetty.filename}" dest="." />
+        <gunzip src="${jetty.filename}" dest="jetty.tar" />
+        <untar src="jetty.tar" dest="." />
         <mkdir dir="jettylib" />
         <copy todir="jettylib">
-            <fileset dir="jetty-5.1.12/lib">
+            <fileset dir="${jetty.base}/lib">
                 <include name="*.jar" />
             </fileset>
         </copy>
         <copy todir="jettylib">
-            <fileset dir="jetty-5.1.12/ext">
+            <fileset dir="${jetty.base}/ext">
                 <include name="ant.jar" />
                 <include name="commons-el.jar" />
                 <include name="commons-logging.jar" />
@@ -81,7 +78,8 @@
                 <include name="org.mortbay.jetty.jar" />
             </fileset>
         </copy>
-        <delete dir="jetty-5.1.12" />
+        <delete file="jetty.tar" />
+        <delete dir="${jetty.base}" />
     </target>
 
     <target name="build" depends="jar" />
@@ -128,9 +126,9 @@
         <mkdir dir="./build/javadoc" />
         <unzip src="${jetty.filename}" dest="./build/javadoc" >
             <patternset>
-                <include name="jetty-5.1.12/javadoc/" />
+                <include name="${jetty.base}/javadoc/" />
             </patternset>
-            <mapper type="glob" from="jetty-5.1.12/javadoc/*" to="javadoc/*" />
+            <mapper type="glob" from="${jetty.base}/javadoc/*" to="javadoc/*" />
         </unzip>
     </target>
 
diff --git a/build.xml b/build.xml
index e724ce058..d9f833f9e 100644
--- a/build.xml
+++ b/build.xml
@@ -255,7 +255,8 @@
 	<defaultexcludes default="true"/>
     </target>
 
-    <target name="pkg" depends="distclean, updater, preppkg, installer" />
+    <!-- A few reeleases only, then back to updater. First release was 0.7.11 -->
+    <target name="pkg" depends="distclean, updaterWithJettyFixes, preppkg, installer" />
 
     <target name="pkgclean" depends="deletepkg-temp">
         <delete>
diff --git a/history.txt b/history.txt
index 311a8c7c1..ec3c07048 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2010-01-31 zzz
+    * i2psnark standalone: Fix CSS
+    * Jetty: Update to 5.1.15 to get ResourceHandler fix
+
 2010-01-30 sponge
     * Fix NPE in TCPtoI2P when a lookup fails, report the error to the stream.
     * Fix setkeys bug in DoCMDS, forgot to create the object before calling
diff --git a/installer/resources/jetty.xml b/installer/resources/jetty.xml
index 9ff09e0bb..2f7f6791f 100644
--- a/installer/resources/jetty.xml
+++ b/installer/resources/jetty.xml
@@ -17,7 +17,7 @@
 <!--   * Uncomment the addWebApplications section to use to enable             -->
 <!--           war files placed in the webapps/ dir.                           -->
 <!--                                                                           -->
-<!-- I2P uses Jetty 5.1.12. We have no plans to upgrade to Jetty 6, due to     -->
+<!-- I2P uses Jetty 5.1.15. We have no plans to upgrade to Jetty 6, due to     -->
 <!-- the significant changes in the API. If you need web server features not   -->
 <!-- found in Jetty 5, you may install and run Jetty 6 in a different JVM,     -->
 <!-- or run any other web server such as Apache. If you do run another         -->
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 8c54ff98c..e72c467bc 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 = 5;
+    public final static long BUILD = 6;
 
     /** for example "-test" */
     public final static String EXTRA = "";