diff --git a/build.properties b/build.properties
index 66f2d02c39..ca0bebc885 100644
--- a/build.properties
+++ b/build.properties
@@ -10,6 +10,7 @@
 # Javadocs
 # 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/
 jrobindocs.url=http://docs.i2p-projekt.de/jrobin/javadoc/
 wrapperdocs.url=http://wrapper.tanukisoftware.com/jdoc/
diff --git a/build.xml b/build.xml
index d772c0df02..92d65ed2f2 100644
--- a/build.xml
+++ b/build.xml
@@ -442,6 +442,7 @@
             <group title="Desktopgui Application" packages="net.i2p.desktopgui:net.i2p.desktopgui.*" />
             <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="SAM Bridge" packages="net.i2p.sam" />
             <group title="SAM Demos" packages="net.i2p.sam.client" />
@@ -466,6 +467,7 @@
                 <pathelement location="apps/susidns/src/java/src" />
                 <pathelement location="apps/susimail/src/src" />
                 <pathelement location="apps/jetty/java/src" />
+                <pathelement location="installer/java/src" />
             </sourcepath>
             <classpath>
                 <pathelement location="apps/jetty/jettylib/org.mortbay.jetty.jar" />
@@ -482,6 +484,7 @@
 	    <!-- These variables are stored in build.properties. 
 		 End-users can override by creating the file override.properties -->
             <link offline="true" href="${javasedocs.url}" packagelistLoc="installer/resources/package-lists/java/" />
+            <link offline="true" href="${javaeedocs.url}" packagelistLoc="installer/resources/package-lists/javaee/" />
             <link offline="true" href="${jettydocs.url}" packagelistLoc="installer/resources/package-lists/jetty/" />
             <link offline="true" href="${jrobindocs.url}" packagelistLoc="installer/resources/package-lists/jrobin/" />
             <link offline="true" href="${wrapperdocs.url}" packagelistLoc="installer/resources/package-lists/wrapper/" />
diff --git a/installer/resources/package-lists/javaee/package-list b/installer/resources/package-lists/javaee/package-list
new file mode 100644
index 0000000000..9f89c7a75e
--- /dev/null
+++ b/installer/resources/package-lists/javaee/package-list
@@ -0,0 +1,112 @@
+javax.annotation
+javax.annotation.security
+javax.annotation.sql
+javax.decorator
+javax.ejb
+javax.ejb.embeddable
+javax.ejb.spi
+javax.el
+javax.enterprise.context
+javax.enterprise.context.spi
+javax.enterprise.deploy.model
+javax.enterprise.deploy.model.exceptions
+javax.enterprise.deploy.shared
+javax.enterprise.deploy.shared.factories
+javax.enterprise.deploy.spi
+javax.enterprise.deploy.spi.exceptions
+javax.enterprise.deploy.spi.factories
+javax.enterprise.deploy.spi.status
+javax.enterprise.event
+javax.enterprise.inject
+javax.enterprise.inject.spi
+javax.enterprise.util
+javax.faces
+javax.faces.application
+javax.faces.bean
+javax.faces.component
+javax.faces.component.behavior
+javax.faces.component.html
+javax.faces.component.visit
+javax.faces.context
+javax.faces.convert
+javax.faces.el
+javax.faces.event
+javax.faces.lifecycle
+javax.faces.model
+javax.faces.render
+javax.faces.validator
+javax.faces.view
+javax.faces.view.facelets
+javax.faces.webapp
+javax.inject
+javax.interceptor
+javax.jms
+javax.jws
+javax.jws.soap
+javax.mail
+javax.mail.event
+javax.mail.internet
+javax.mail.search
+javax.mail.util
+javax.management.j2ee
+javax.management.j2ee.statistics
+javax.persistence
+javax.persistence.criteria
+javax.persistence.metamodel
+javax.persistence.spi
+javax.resource
+javax.resource.cci
+javax.resource.spi
+javax.resource.spi.endpoint
+javax.resource.spi.security
+javax.resource.spi.work
+javax.security.auth.message
+javax.security.auth.message.callback
+javax.security.auth.message.config
+javax.security.auth.message.module
+javax.security.jacc
+javax.servlet
+javax.servlet.annotation
+javax.servlet.descriptor
+javax.servlet.http
+javax.servlet.jsp
+javax.servlet.jsp.el
+javax.servlet.jsp.jstl.core
+javax.servlet.jsp.jstl.fmt
+javax.servlet.jsp.jstl.sql
+javax.servlet.jsp.jstl.tlv
+javax.servlet.jsp.tagext
+javax.transaction
+javax.transaction.xa
+javax.validation
+javax.validation.bootstrap
+javax.validation.constraints
+javax.validation.groups
+javax.validation.metadata
+javax.validation.spi
+javax.ws.rs
+javax.ws.rs.core
+javax.ws.rs.ext
+javax.xml.bind
+javax.xml.bind.annotation
+javax.xml.bind.annotation.adapters
+javax.xml.bind.attachment
+javax.xml.bind.helpers
+javax.xml.bind.util
+javax.xml.registry
+javax.xml.registry.infomodel
+javax.xml.rpc
+javax.xml.rpc.encoding
+javax.xml.rpc.handler
+javax.xml.rpc.handler.soap
+javax.xml.rpc.holders
+javax.xml.rpc.server
+javax.xml.rpc.soap
+javax.xml.ws
+javax.xml.ws.handler
+javax.xml.ws.handler.soap
+javax.xml.ws.http
+javax.xml.ws.soap
+javax.xml.ws.spi
+javax.xml.ws.spi.http
+javax.xml.ws.wsaddressing
diff --git a/installer/resources/package-lists/jetty/package-list b/installer/resources/package-lists/jetty/package-list
index 9e991e7daf..186b329955 100644
--- a/installer/resources/package-lists/jetty/package-list
+++ b/installer/resources/package-lists/jetty/package-list
@@ -1,37 +1,72 @@
-javax.servlet
-javax.servlet.http
-javax.servlet.jsp
-javax.servlet.jsp.el
-javax.servlet.jsp.tagext
-org.mortbay.ftp
+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.http
-org.mortbay.http.ajp
-org.mortbay.http.ajp.jmx
-org.mortbay.http.handler
-org.mortbay.http.handler.jmx
-org.mortbay.http.ibmjsse
-org.mortbay.http.jmx
-org.mortbay.http.nio
-org.mortbay.jaas
-org.mortbay.jaas.callback
-org.mortbay.jaas.spi
+org.mortbay.io
+org.mortbay.io.bio
+org.mortbay.io.nio
 org.mortbay.jetty
-org.mortbay.jetty.jmx
-org.mortbay.jetty.plus
-org.mortbay.jetty.plus.jmx
+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.jmx
-org.mortbay.jetty.win32
-org.mortbay.jndi
-org.mortbay.jndi.java
-org.mortbay.jndi.local
-org.mortbay.loadbalancer
+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.log4j
+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.stop
+org.mortbay.terracotta.servlet
+org.mortbay.thread
+org.mortbay.thread.concurrent
 org.mortbay.util
-org.mortbay.util.jmx
+org.mortbay.util.ajax
+org.mortbay.util.daemon
 org.mortbay.xml