diff --git a/build.properties b/build.properties
index 954542089..11c8b4bc9 100644
--- a/build.properties
+++ b/build.properties
@@ -14,7 +14,7 @@ javaeedocs.url=http://docs.oracle.com/javaee/7/api/
 # The following link is dead, perhaps temporarily,
 # perhaps not, as they move 7 and 8 to unsupported status.
 #jettydocs.url=http://download.eclipse.org/jetty/stable-8/apidocs/
-jettydocs.url=http://download.eclipse.org/jetty/8.1.17.v20150415/apidocs/
+jettydocs.url=http://download.eclipse.org/jetty/9.2.21.v20170120/apidocs/
 wrapperdocs.url=http://wrapper.tanukisoftware.com/jdoc/
 # these are only for unit test javadocs
 i2pdocs.url=http://docs.i2p-projekt.de/javadoc/
diff --git a/build.xml b/build.xml
index ccbec260e..16c8f3ea6 100644
--- a/build.xml
+++ b/build.xml
@@ -764,6 +764,7 @@
             </sourcepath>
             <classpath>
                 <pathelement location="apps/jetty/jettylib/org.mortbay.jetty.jar" />
+                <pathelement location="apps/jetty/jettylib/jasper-runtime.jar" />
                 <pathelement location="apps/jetty/jettylib/javax.servlet.jar" />
                 <pathelement location="apps/jetty/jettylib/jetty-http.jar" />
                 <pathelement location="apps/jetty/jettylib/jetty-security.jar" />
diff --git a/installer/resources/package-lists/jetty/package-list b/installer/resources/package-lists/jetty/package-list
index cb418a087..4dc77fb3a 100644
--- a/installer/resources/package-lists/jetty/package-list
+++ b/installer/resources/package-lists/jetty/package-list
@@ -1,11 +1,17 @@
 
-org.eclipse.jetty.ajp
+org.eclipse.jetty.alpn.client
+org.eclipse.jetty.alpn.server
 org.eclipse.jetty.annotations
+org.eclipse.jetty.ant
+org.eclipse.jetty.ant.types
+org.eclipse.jetty.ant.utils
+org.eclipse.jetty.apache.jsp
+org.eclipse.jetty.cdi
 org.eclipse.jetty.client
-org.eclipse.jetty.client.security
-org.eclipse.jetty.client.webdav
+org.eclipse.jetty.client.api
+org.eclipse.jetty.client.http
+org.eclipse.jetty.client.util
 org.eclipse.jetty.continuation
-org.eclipse.jetty.continuation.test
 org.eclipse.jetty.deploy
 org.eclipse.jetty.deploy.bindings
 org.eclipse.jetty.deploy.graph
@@ -14,30 +20,38 @@ org.eclipse.jetty.deploy.providers
 org.eclipse.jetty.deploy.util
 org.eclipse.jetty.embedded
 org.eclipse.jetty.example.asyncrest
+org.eclipse.jetty.fcgi
+org.eclipse.jetty.fcgi.client.http
+org.eclipse.jetty.fcgi.generator
+org.eclipse.jetty.fcgi.parser
+org.eclipse.jetty.fcgi.server
+org.eclipse.jetty.fcgi.server.proxy
 org.eclipse.jetty.http
-org.eclipse.jetty.http.gzip
+org.eclipse.jetty.http.pathmap
 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.io.ssl
+org.eclipse.jetty.jaas
+org.eclipse.jetty.jaas.callback
+org.eclipse.jetty.jaas.spi
 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.jsp
+org.eclipse.jetty.jspc.plugin
+org.eclipse.jetty.maven.plugin
 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.annotations
 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
@@ -47,51 +61,52 @@ org.eclipse.jetty.osgi.boot.utils.internal
 org.eclipse.jetty.osgi.boot.warurl
 org.eclipse.jetty.osgi.boot.warurl.internal
 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.proxy
+org.eclipse.jetty.quickstart
 org.eclipse.jetty.rewrite.handler
+org.eclipse.jetty.runner
 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.jmx
 org.eclipse.jetty.servlet.listener
 org.eclipse.jetty.servlets
+org.eclipse.jetty.servlets.gzip
 org.eclipse.jetty.spdy
 org.eclipse.jetty.spdy.api
 org.eclipse.jetty.spdy.api.server
+org.eclipse.jetty.spdy.client
+org.eclipse.jetty.spdy.client.http
 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.spdy.server
+org.eclipse.jetty.spdy.server.http
+org.eclipse.jetty.spdy.server.proxy
+org.eclipse.jetty.spring
 org.eclipse.jetty.start
-org.eclipse.jetty.testing
+org.eclipse.jetty.start.config
+org.eclipse.jetty.test.jmx
+org.eclipse.jetty.test.jmx.jmx
 org.eclipse.jetty.tests.webapp
 org.eclipse.jetty.util
 org.eclipse.jetty.util.ajax
+org.eclipse.jetty.util.annotation
 org.eclipse.jetty.util.component
 org.eclipse.jetty.util.log
 org.eclipse.jetty.util.log.jmx
@@ -102,5 +117,39 @@ 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.websocket.api
+org.eclipse.jetty.websocket.api.annotations
+org.eclipse.jetty.websocket.api.extensions
+org.eclipse.jetty.websocket.api.util
+org.eclipse.jetty.websocket.client
+org.eclipse.jetty.websocket.client.io
+org.eclipse.jetty.websocket.client.masks
+org.eclipse.jetty.websocket.common
+org.eclipse.jetty.websocket.common.events
+org.eclipse.jetty.websocket.common.events.annotated
+org.eclipse.jetty.websocket.common.extensions
+org.eclipse.jetty.websocket.common.extensions.compress
+org.eclipse.jetty.websocket.common.extensions.fragment
+org.eclipse.jetty.websocket.common.extensions.identity
+org.eclipse.jetty.websocket.common.frames
+org.eclipse.jetty.websocket.common.io
+org.eclipse.jetty.websocket.common.io.http
+org.eclipse.jetty.websocket.common.io.payload
+org.eclipse.jetty.websocket.common.message
+org.eclipse.jetty.websocket.common.util
+org.eclipse.jetty.websocket.jsr356
+org.eclipse.jetty.websocket.jsr356.annotations
+org.eclipse.jetty.websocket.jsr356.client
+org.eclipse.jetty.websocket.jsr356.decoders
+org.eclipse.jetty.websocket.jsr356.encoders
+org.eclipse.jetty.websocket.jsr356.endpoints
+org.eclipse.jetty.websocket.jsr356.messages
+org.eclipse.jetty.websocket.jsr356.metadata
+org.eclipse.jetty.websocket.jsr356.server
+org.eclipse.jetty.websocket.jsr356.server.deploy
+org.eclipse.jetty.websocket.jsr356.server.pathmap
+org.eclipse.jetty.websocket.jsr356.utils
+org.eclipse.jetty.websocket.server
+org.eclipse.jetty.websocket.server.pathmap
+org.eclipse.jetty.websocket.servlet
 org.eclipse.jetty.xml