diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index 7d4c824cf..2ca7056cf 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -12,6 +12,7 @@
 
     <target name="all" depends="build" />
 
+  <!--
     <target name="ensureJettylib" >
         <available property="jetty.zip.available" file="${jetty.filename}" type="file" />
         <available property="jetty.zip.extracted" file="jettylib" type="dir" />
@@ -19,6 +20,8 @@
         <ant target="verifyJettylib" />
         <ant target="extractJettylib" />
     </target>
+   -->
+    <target name="ensureJettylib" depends="extractJettylib" />
 
     <target name="fetchJettylib" unless="jetty.zip.available" >
         <echo message="It seems that you don't have '${jetty.filename}' deployed." />
@@ -65,14 +68,19 @@
         <touch file="${verified.filename}" />
     </target>
 
+  <!--
     <target name="extractJettylib" unless="jetty.zip.extracted" >
+   -->
+    <target name="extractJettylib" >
       <!-- for .tgz -->
       <!--
         <gunzip src="${jetty.filename}" dest="jetty.tar" />
         <untar src="jetty.tar" dest="." />
       -->
       <!-- for .zip -->
+      <!--
         <unzip src="${jetty.filename}" dest="." />
+      -->
         <mkdir dir="jettylib" />
       <!-- We copy everything to names without the version numbers so we
            can update them later. Where there was something similar in Jetty 5,
@@ -96,7 +104,9 @@
         <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-sslengine-${jetty.ver}.jar" tofile="jettylib/jetty-sslengine.jar" />
         <copy preservelastmodified="true" file="${jetty.base}/lib/management/jetty-management-${jetty.ver}.jar" tofile="jettylib/org.mortbay.jmx.jar" />
         <delete file="jetty.tar" />
+      <!--
         <delete dir="${jetty.base}" />
+      -->
         <!-- commons-logging.jar not in Jetty 6 but we have it in launch4j so copy it over, we need it
              for org.apache.jasper.JspC compiler
           -->
@@ -200,7 +210,9 @@
     <target name="cleandep" depends="clean" />
     <target name="distclean" depends="clean">
         <delete dir="./jettylib" />
+      <!--
         <echo message="Not actually deleting the jetty libs (since they're so large)" />
+       -->
     </target>
     <target name="reallyclean" depends="distclean">
     </target>
diff --git a/apps/jetty/jetty-6.1.26/README-i2p.txt b/apps/jetty/jetty-6.1.26/README-i2p.txt
new file mode 100644
index 000000000..efbecbcdc
--- /dev/null
+++ b/apps/jetty/jetty-6.1.26/README-i2p.txt
@@ -0,0 +1,3 @@
+This is only what we need out of the 25 MB Jetty-6.1.26.zip.
+
+NOTICE and LICENSE files moved to ../../../licenses
diff --git a/apps/jetty/jetty-6.1.26/lib/ext/jetty-java5-threadpool-6.1.26.jar b/apps/jetty/jetty-6.1.26/lib/ext/jetty-java5-threadpool-6.1.26.jar
new file mode 100644
index 000000000..fb75a1c62
Binary files /dev/null and b/apps/jetty/jetty-6.1.26/lib/ext/jetty-java5-threadpool-6.1.26.jar differ
diff --git a/apps/jetty/jetty-6.1.26/lib/ext/jetty-rewrite-handler-6.1.26.jar b/apps/jetty/jetty-6.1.26/lib/ext/jetty-rewrite-handler-6.1.26.jar
new file mode 100644
index 000000000..3d0a7fbe4
Binary files /dev/null and b/apps/jetty/jetty-6.1.26/lib/ext/jetty-rewrite-handler-6.1.26.jar differ
diff --git a/apps/jetty/jetty-6.1.26/lib/ext/jetty-sslengine-6.1.26.jar b/apps/jetty/jetty-6.1.26/lib/ext/jetty-sslengine-6.1.26.jar
new file mode 100644
index 000000000..051efb59d
Binary files /dev/null and b/apps/jetty/jetty-6.1.26/lib/ext/jetty-sslengine-6.1.26.jar differ
diff --git a/apps/jetty/jetty-6.1.26/lib/jetty-6.1.26.jar b/apps/jetty/jetty-6.1.26/lib/jetty-6.1.26.jar
new file mode 100644
index 000000000..2cbe07aee
Binary files /dev/null and b/apps/jetty/jetty-6.1.26/lib/jetty-6.1.26.jar differ
diff --git a/apps/jetty/jetty-6.1.26/lib/jetty-util-6.1.26.jar b/apps/jetty/jetty-6.1.26/lib/jetty-util-6.1.26.jar
new file mode 100644
index 000000000..cd237528a
Binary files /dev/null and b/apps/jetty/jetty-6.1.26/lib/jetty-util-6.1.26.jar differ
diff --git a/apps/jetty/jetty-6.1.26/lib/management/jetty-management-6.1.26.jar b/apps/jetty/jetty-6.1.26/lib/management/jetty-management-6.1.26.jar
new file mode 100644
index 000000000..b5eeecb32
Binary files /dev/null and b/apps/jetty/jetty-6.1.26/lib/management/jetty-management-6.1.26.jar differ
diff --git a/apps/jetty/jetty-6.1.26/start.jar b/apps/jetty/jetty-6.1.26/start.jar
new file mode 100644
index 000000000..d3a94bcfa
Binary files /dev/null and b/apps/jetty/jetty-6.1.26/start.jar differ