diff --git a/build.properties b/build.properties
index cf4daadd9..de1db9518 100644
--- a/build.properties
+++ b/build.properties
@@ -11,7 +11,7 @@
 # Note: Include the trailing slash! Don't surround the URL in quotes!
 javasedocs.url=http://docs.oracle.com/javase/6/docs/api/
 javaeedocs.url=http://docs.oracle.com/javaee/6/api/
-jettydocs.url=http://jetty.codehaus.org/jetty/jetty-6/apidocs/
+jettydocs.url=http://download.eclipse.org/jetty/stable-7/apidocs/
 jrobindocs.url=http://docs.i2p-projekt.de/jrobin/javadoc/
 wrapperdocs.url=http://wrapper.tanukisoftware.com/jdoc/
 # these are only for unit test javadocs
diff --git a/build.xml b/build.xml
index b55583d06..83fa3baea 100644
--- a/build.xml
+++ b/build.xml
@@ -472,7 +472,7 @@
             <group title="I2PSnark Application" packages="org.klomp.snark:org.klomp.snark.*:net.i2p.kademlia" />
             <group title="I2PTunnel Application" packages="net.i2p.i2ptunnel:net.i2p.i2ptunnel.*" />
             <group title="Installer Utilities" packages="net.i2p.installer" />
-            <group title="Jetty Logging" packages="net.i2p.jetty" />
+            <group title="Jetty Starter and Logging" packages="net.i2p.jetty" />
             <group title="SAM Bridge" packages="net.i2p.sam" />
             <group title="SAM Demos" packages="net.i2p.sam.client" />
             <group title="SusiDNS Application" packages="i2p.susi.dns" />
@@ -501,10 +501,13 @@
             <classpath>
                 <pathelement location="apps/jetty/jettylib/org.mortbay.jetty.jar" />
                 <pathelement location="apps/jetty/jettylib/javax.servlet.jar" />
-                <pathelement location="apps/jetty/jettylib/jetty-sslengine.jar" />
+                <pathelement location="apps/jetty/jettylib/jetty-http.jar" />
+                <pathelement location="apps/jetty/jettylib/jetty-security.jar" />
+                <pathelement location="apps/jetty/jettylib/jetty-servlet.jar" />
                 <pathelement location="apps/jetty/jettylib/jetty-start.jar" />
-                <pathelement location="apps/jetty/jettylib/jetty-java5-threadpool.jar" />
                 <pathelement location="apps/jetty/jettylib/jetty-util.jar" />
+                <pathelement location="apps/jetty/jettylib/jetty-webapp.jar" />
+                <pathelement location="apps/jetty/jettylib/jetty-xml.jar" />
                 <pathelement location="apps/jetty/jettylib/jsp-api.jar" />
                 <pathelement location="apps/systray/java/lib/systray4j.jar" />
                 <pathelement location="apps/jrobin/jrobin-1.5.9.1.jar" />
diff --git a/installer/resources/package-lists/jetty/package-list b/installer/resources/package-lists/jetty/package-list
index 186b32995..63752420b 100644
--- a/installer/resources/package-lists/jetty/package-list
+++ b/installer/resources/package-lists/jetty/package-list
@@ -1,72 +1,109 @@
-com.acme
-org.cometd.demo
-org.cometd.oort
-org.mortbay.cometd
-org.mortbay.cometd.client
-org.mortbay.cometd.client.ext
-org.mortbay.cometd.continuation
-org.mortbay.cometd.ext
-org.mortbay.cometd.filter
-org.mortbay.component
-org.mortbay.html
-org.mortbay.io
-org.mortbay.io.bio
-org.mortbay.io.nio
-org.mortbay.jetty
-org.mortbay.jetty.ajp
-org.mortbay.jetty.annotations
-org.mortbay.jetty.ant
-org.mortbay.jetty.ant.types
-org.mortbay.jetty.ant.utils
-org.mortbay.jetty.bio
-org.mortbay.jetty.client
-org.mortbay.jetty.client.security
-org.mortbay.jetty.client.webdav
-org.mortbay.jetty.deployer
-org.mortbay.jetty.example
-org.mortbay.jetty.handler
-org.mortbay.jetty.handler.management
-org.mortbay.jetty.handler.rewrite
-org.mortbay.jetty.jspc.plugin
-org.mortbay.jetty.management
-org.mortbay.jetty.nio
-org.mortbay.jetty.plugin
-org.mortbay.jetty.plugin.util
-org.mortbay.jetty.plus.annotation
-org.mortbay.jetty.plus.jaas
-org.mortbay.jetty.plus.jaas.callback
-org.mortbay.jetty.plus.jaas.ldap
-org.mortbay.jetty.plus.jaas.spi
-org.mortbay.jetty.plus.naming
-org.mortbay.jetty.plus.servlet
-org.mortbay.jetty.plus.webapp
-org.mortbay.jetty.security
-org.mortbay.jetty.servlet
-org.mortbay.jetty.servlet.management
-org.mortbay.jetty.spring
-org.mortbay.jetty.spring.jee
-org.mortbay.jetty.start.daemon
-org.mortbay.jetty.testing
-org.mortbay.jetty.webapp
-org.mortbay.jetty.webapp.management
-org.mortbay.jetty.win32service
-org.mortbay.jetty.xbean
-org.mortbay.log
-org.mortbay.management
-org.mortbay.naming
-org.mortbay.naming.factories
-org.mortbay.naming.java
-org.mortbay.naming.local
-org.mortbay.proxy
-org.mortbay.resource
-org.mortbay.servlet
-org.mortbay.servlet.jetty
-org.mortbay.setuid
-org.mortbay.start
-org.mortbay.terracotta.servlet
-org.mortbay.thread
-org.mortbay.thread.concurrent
-org.mortbay.util
-org.mortbay.util.ajax
-org.mortbay.util.daemon
-org.mortbay.xml
+
+org.eclipse.jetty.ajp
+org.eclipse.jetty.annotations
+org.eclipse.jetty.client
+org.eclipse.jetty.client.security
+org.eclipse.jetty.client.webdav
+org.eclipse.jetty.continuation
+org.eclipse.jetty.continuation.test
+org.eclipse.jetty.deploy
+org.eclipse.jetty.deploy.bindings
+org.eclipse.jetty.deploy.graph
+org.eclipse.jetty.deploy.jmx
+org.eclipse.jetty.deploy.providers
+org.eclipse.jetty.deploy.util
+org.eclipse.jetty.embedded
+org.eclipse.jetty.http
+org.eclipse.jetty.http.gzip
+org.eclipse.jetty.http.spi
+org.eclipse.jetty.http.ssl
+org.eclipse.jetty.io
+org.eclipse.jetty.io.bio
+org.eclipse.jetty.io.nio
+org.eclipse.jetty.jmx
+org.eclipse.jetty.jndi
+org.eclipse.jetty.jndi.factories
+org.eclipse.jetty.jndi.java
+org.eclipse.jetty.jndi.local
+org.eclipse.jetty.monitor
+org.eclipse.jetty.monitor.integration
+org.eclipse.jetty.monitor.jmx
+org.eclipse.jetty.monitor.thread
+org.eclipse.jetty.monitor.triggers
+org.eclipse.jetty.nested
+org.eclipse.jetty.nosql
+org.eclipse.jetty.nosql.mongodb
+org.eclipse.jetty.nosql.mongodb.jmx
+org.eclipse.jetty.osgi.boot
+org.eclipse.jetty.osgi.boot.internal.jsp
+org.eclipse.jetty.osgi.boot.internal.serverfactory
+org.eclipse.jetty.osgi.boot.internal.webapp
+org.eclipse.jetty.osgi.boot.jasper
+org.eclipse.jetty.osgi.boot.jsp
+org.eclipse.jetty.osgi.boot.logback
+org.eclipse.jetty.osgi.boot.logback.internal
+org.eclipse.jetty.osgi.boot.utils
+org.eclipse.jetty.osgi.boot.utils.internal
+org.eclipse.jetty.osgi.boot.warurl
+org.eclipse.jetty.osgi.boot.warurl.internal
+org.eclipse.jetty.osgi.equinoxtools
+org.eclipse.jetty.osgi.equinoxtools.console
+org.eclipse.jetty.osgi.httpservice
+org.eclipse.jetty.osgi.nested
+org.eclipse.jetty.overlays
+org.eclipse.jetty.plus.annotation
+org.eclipse.jetty.plus.jaas
+org.eclipse.jetty.plus.jaas.callback
+org.eclipse.jetty.plus.jaas.spi
+org.eclipse.jetty.plus.jndi
+org.eclipse.jetty.plus.security
+org.eclipse.jetty.plus.servlet
+org.eclipse.jetty.plus.webapp
+org.eclipse.jetty.policy
+org.eclipse.jetty.policy.entry
+org.eclipse.jetty.policy.loader
+org.eclipse.jetty.rewrite.handler
+org.eclipse.jetty.security
+org.eclipse.jetty.security.authentication
+org.eclipse.jetty.security.jaspi
+org.eclipse.jetty.security.jaspi.callback
+org.eclipse.jetty.security.jaspi.modules
+org.eclipse.jetty.server
+org.eclipse.jetty.server.bio
+org.eclipse.jetty.server.handler
+org.eclipse.jetty.server.handler.jmx
+org.eclipse.jetty.server.jmx
+org.eclipse.jetty.server.nio
+org.eclipse.jetty.server.session
+org.eclipse.jetty.server.session.jmx
+org.eclipse.jetty.server.ssl
+org.eclipse.jetty.servlet
+org.eclipse.jetty.servlet.api
+org.eclipse.jetty.servlet.jmx
+org.eclipse.jetty.servlet.listener
+org.eclipse.jetty.servlets
+org.eclipse.jetty.spdy
+org.eclipse.jetty.spdy.api
+org.eclipse.jetty.spdy.api.server
+org.eclipse.jetty.spdy.frames
+org.eclipse.jetty.spdy.generator
+org.eclipse.jetty.spdy.http
+org.eclipse.jetty.spdy.parser
+org.eclipse.jetty.spdy.proxy
+org.eclipse.jetty.start
+org.eclipse.jetty.testing
+org.eclipse.jetty.tests.webapp
+org.eclipse.jetty.util
+org.eclipse.jetty.util.ajax
+org.eclipse.jetty.util.component
+org.eclipse.jetty.util.log
+org.eclipse.jetty.util.log.jmx
+org.eclipse.jetty.util.preventers
+org.eclipse.jetty.util.resource
+org.eclipse.jetty.util.security
+org.eclipse.jetty.util.ssl
+org.eclipse.jetty.util.statistic
+org.eclipse.jetty.util.thread
+org.eclipse.jetty.webapp
+org.eclipse.jetty.websocket
+org.eclipse.jetty.xml