diff --git a/LICENSE.txt b/LICENSE.txt
index d177d7983..206d51f10 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -212,12 +212,11 @@ Applications:
      Zxing 3.3.0:
        See licenses/LICENSE-Apache2.0.txt
 
-   Jetty 8.1.21.v20160908:
+   Jetty 9.2.21.v20170120:
    See licenses/ABOUT-Jetty.html
    See licenses/NOTICE-Jetty.html
    See licenses/LICENSE-Apache2.0.txt
    See licenses/LICENSE-ECLIPSE-1.0.html
-   See licenses/NOTICE-Commons-Logging.txt
 
    JRobin 1.6.0-1:
    Copyright (c) 2001-2005 Sasa Markovic and Ciaran Treanor.
@@ -283,7 +282,7 @@ Applications:
       Bundles systray4j-2.4.1:
       See licenses/LICENSE-LGPLv2.1.txt
 
-   Tomcat 6.0.48:
+   Tomcat 8.0.33:
    Copyright 1999-2016 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
    See licenses/NOTICE-Tomcat.txt
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index b9bf0401b..0377e74b8 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -25,12 +25,6 @@
     <property name="verified.filename" value="verified.txt" />
     <property name="javac.compilerargs" value="" />
     <property name="javac.version" value="1.7" />
-<!--
-    <property name="tomcat.lib" value="apache-tomcat-deployer/lib" />
-    <property name="tomcat.ver" value="6.0.48" />
-    <property name="tomcat2.lib" value="apache-tomcat-${tomcat.ver}/lib" />
-    <property name="tomcat2.lib.small" value="apache-tomcat/lib" />
--->
 
     <target name="all" depends="build" />
 
@@ -125,7 +119,14 @@
     </target>
 
     <!-- Jetty and tomcat files -->
-    <target name="copyJettylib" depends="mkJettylibdir, copyJettylib1, copyTomcatLib" />
+    <!--
+         We support the following configurations:
+           no system jars: Precise, Trusty
+           with-libtomcat8-java: Jessie (without backports), Wheezy
+           with-libtomcat8-java AND with-libjetty9-java: Xenial, Jessie (with backports), Stretch
+           with-libjetty9-java (only): not supported
+     -->
+    <target name="copyJettylib" depends="mkJettylibdir, copyJettylib1, copyTomcatLib1, copyJettylib2, copyTomcatLib" />
 
     <!-- Jetty files only -->
     <target name="copyJettylib1" depends="extractJettylib" unless="${with-libjetty9-java}" >
@@ -171,6 +172,10 @@
                 <attribute name="Note" value="Intentionally empty" />
             </manifest>
         </jar>
+    </target>
+
+    <!-- If with-libtomcat8-java but not with-libjetty9-java, we don't do this -->
+    <target name="copyJettylib2" depends="extractJettylib" unless="${with-libtomcat8-java}" >
         <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
             <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/servlet-api-3.1.jar" />
           <!--
@@ -188,38 +193,8 @@
         <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,
-             needed for old plugins and things. We add tomcat-juli below.
-          -->
-      <!--
-        * Removed in 0.9.24, see ticket #1679
-        * Jetty now uses tomcat-juli (added below to commons-logging.jar), not commons-logging proper,
-        * and no known plugins use it either.
-        <jar destfile="jettylib/commons-logging.jar" filesetmanifest="mergewithoutmain" >
-            <zipfileset excludes="META-INF/LICENSE.txt META-INF/NOTICE.txt" src="../../installer/lib/launch4j/lib/commons-logging.jar" />
-        </jar>
-      -->
     </target>
 
-    <!-- Tomcat util jar.
-         As of Tomcat 6.0.39, the deployer does not contain some classes that are required
-         to precompile jsps with tags (SusiDNS and i2p-bote).
-         These classes are in the main Tomcat package, in lib/tomcat-coyote.jar.
-         As the jar is 800 KB and we only need 12 KB of that, we extract the required classes
-         to a new jar, created and checked in using this target.
-         Apparently this is only required for precompilation of jsps, so this is put in
-         with the JspC compiler jasper-runtime.jar below.
-     -->
-
-    <!-- take only what we need from the tomcat-coyote jar -->
-<!--
-    <target name="buildTomcatUtilJar" unless="${with-libjetty9-java}" >
-        <jar destfile="${tomcat2.lib.small}/tomcat-coyote-util.jar" >
-            <zipfileset src="${tomcat2.lib}/tomcat-coyote.jar"
-             includes="org/apache/tomcat/util/descriptor/* org/apache/tomcat/util/res/*" />
-        </jar>
-    </target>
--->
 
     <!-- Tomcat.
          The glassfish jars bundled in Jetty 6 are way too old.
@@ -258,7 +233,7 @@
              2.2 is backwards-compatible with 2.1.
          -->
         <!-- the javax.el API, AND the com.sun.el parser -->
-        <!-- actually from jetty9, not tomcat8... this will fail unless neither or both -->
+        <!-- actually from jetty9, not tomcat8... this will fail unless we have the jetty files also -->
         <jar destfile="jettylib/commons-el.jar" >
           <!--
             Jetty version
@@ -268,7 +243,7 @@
             <zipfileset src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.33.jar"/>
         </jar>
 
-        <!-- actually from jetty9, not tomcat8... this will fail unless neither or both -->
+        <!-- actually from jetty9, not tomcat8... this will fail unless we have the jetty files also -->
         <jar destfile="jettylib/jasper-runtime.jar" >
           <!--
             Jetty version
@@ -287,21 +262,10 @@
             <zipfileset src="${jetty.base}/lib/apache-jsp/org.eclipse.jetty.apache-jsp-${jetty.ver}.jar"/>
         </jar>
 
-<!--
-        <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
-            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/servlet-api.jar" />
-            <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/jsp-api.jar" />
-            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-api.jar" />
-            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-util.jar" />
-        </jar>
--->
         <!-- Ant bug, don't set update and filesetmanifest or the update doesn't happen,
              Their bug tracker claims fixed in 1.8.0 but broken for me in 1.8.1
           -->
         <jar destfile="jettylib/commons-logging.jar" update="true" >
-<!--
-            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-juli.jar" />
--->
             <manifest>
                 <attribute name="Note" value="Intentionally empty" />
             </manifest>
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
index eeb855c5c..e6a5e8ee0 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
@@ -40,7 +40,6 @@ import net.i2p.util.SecureDirectory;
 import net.i2p.util.I2PSSLSocketFactory;
 import net.i2p.util.SystemVersion;
 
-import org.apache.tomcat.SimpleInstanceManager;
 import org.eclipse.jetty.security.HashLoginService;
 import org.eclipse.jetty.security.ConstraintMapping;
 import org.eclipse.jetty.security.ConstraintSecurityHandler;
@@ -648,7 +647,9 @@ public class RouterConsoleRunner implements RouterApp {
             } catch (ClassNotFoundException cnfe) {
                 System.err.println("Warning: JettyJasperInitializer not found");
             }
-            initialize(_context, (WebAppContext)(rootWebApp.getHandler()));
+            WebAppContext wac = (WebAppContext)(rootWebApp.getHandler());
+            initialize(_context, wac);
+            WebAppStarter.setWebAppConfiguration(wac);
             chColl.addHandler(rootWebApp);
 
         } catch (Exception ioe) {
@@ -662,10 +663,6 @@ public class RouterConsoleRunner implements RouterApp {
         try {
             // start does a mapContexts()
             _server.start();
-            // can't do this before start
-            // http://stackoverflow.com/questions/17529936/issues-while-using-jetty-embedded-to-handle-jsp-jasperexception-unable-to-com
-            // https://github.com/jetty-project/embedded-jetty-jsp/blob/master/src/main/java/org/eclipse/jetty/demo/Main.java
-            rootServletHandler.getServletContext().setAttribute("org.apache.tomcat.InstanceManager", new SimpleInstanceManager());
         } catch (Throwable me) {
             // NoClassFoundDefError from a webapp is a throwable, not an exception
             System.err.println("Error starting the Router Console server: " + me);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java b/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java
index c88ec64d9..20b97834e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java
@@ -15,6 +15,7 @@ import java.util.StringTokenizer;
 
 import net.i2p.I2PAppContext;
 
+import org.apache.tomcat.SimpleInstanceManager;
 import org.eclipse.jetty.webapp.Configuration;
 import org.eclipse.jetty.webapp.WebAppClassLoader;
 import org.eclipse.jetty.webapp.WebAppContext;
@@ -191,6 +192,10 @@ public class WebAppConfiguration implements Configuration {
     /** @since Jetty 7 */
     public void configure(WebAppContext context) throws Exception {
         configureClassPath(context);
+        // do we just need one, in the ContextHandlerCollection, or one for each?
+        // http://stackoverflow.com/questions/17529936/issues-while-using-jetty-embedded-to-handle-jsp-jasperexception-unable-to-com
+        // https://github.com/jetty-project/embedded-jetty-jsp/blob/master/src/main/java/org/eclipse/jetty/demo/Main.java
+        context.getServletContext().setAttribute("org.apache.tomcat.InstanceManager", new SimpleInstanceManager());
     }
 
     /** @since Jetty 7 */
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
index 4d659c200..876f99fcb 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
@@ -10,7 +10,6 @@ import net.i2p.router.RouterContext;
 import net.i2p.util.FileUtil;
 import net.i2p.util.SecureDirectory;
 
-import org.apache.tomcat.SimpleInstanceManager;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.ContextHandler;
@@ -64,11 +63,6 @@ public class WebAppStarter {
          // and the caller will know it failed
          wac.setThrowUnavailableOnStartupException(true);
          wac.start();
-         // can't do this before start
-         // do we just need one, in the ContextHandlerCollection, or one for each?
-         // http://stackoverflow.com/questions/17529936/issues-while-using-jetty-embedded-to-handle-jsp-jasperexception-unable-to-com
-         // https://github.com/jetty-project/embedded-jetty-jsp/blob/master/src/main/java/org/eclipse/jetty/demo/Main.java
-         wac.getServletContext().setAttribute("org.apache.tomcat.InstanceManager", new SimpleInstanceManager());
     }
 
     /**
@@ -115,7 +109,16 @@ public class WebAppStarter {
 
         // this does the passwords...
         RouterConsoleRunner.initialize(ctx, wac);
+        setWebAppConfiguration(wac);
+        server.addHandler(wac);
+        server.mapContexts();
+        return wac;
+    }
 
+    /**
+     *  @since Jetty 9
+     */
+    static void setWebAppConfiguration(WebAppContext wac) {
         // see WebAppConfiguration for info
         String[] classNames = wac.getConfigurationClasses();
         // In Jetty 9, it doesn't set the defaults if we've already added one, but the
@@ -130,9 +133,6 @@ public class WebAppStarter {
              newClassNames[j] = classNames[j];
         newClassNames[classNames.length] = WebAppConfiguration.class.getName();
         wac.setConfigurationClasses(newClassNames);
-        server.addHandler(wac);
-        server.mapContexts();
-        return wac;
     }
 
     /**
diff --git a/build.properties b/build.properties
index 9577a65b9..954542089 100644
--- a/build.properties
+++ b/build.properties
@@ -131,7 +131,7 @@ javac.version=1.7
 ### Debian/Ubuntu packages ###
 # Don't include geoip files, we will use geoip-database package
 #with-geoip-database=true
-# Don't include jetty files, we will use libjetty9-java package
+# Don't include jetty files, we will use libjetty9-java package. Requires with-libtomcat8-java=true.
 #with-libjetty9-java=true
 # Don't include tomcat files, we will use libtomcat8-java package
 #with-libtomcat8-java=true
diff --git a/debian-alt/README.txt b/debian-alt/README.txt
index 9bc53dd6d..4a2c53882 100644
--- a/debian-alt/README.txt
+++ b/debian-alt/README.txt
@@ -1,7 +1,13 @@
-The files in ../debian/ are for jessie/stable.
-Alternates are in the subdirectories here.
+The files in ../debian/ are for stretch.
+You may also use them for jessie if you have libjetty9-java from jessie-backports.
 
-trusty may be copied to utopic, vivid, wily, xenial.
+Alternates are in the subdirectories here.
+To use them, copy them over the files in ../debian/  .
+
+Built file compatibility:
+trusty may be copied to vivid.
+trusty may be used for jessie without libjetty9-java from backports.
+xenial may be copied to yakkety, zesty.
 
 tails-jessie and tails-wheezy are currently the same as
 jessie and wheezy, respectively. If they diverge, put the changes here.
diff --git a/debian-alt/jessie/README.txt b/debian-alt/jessie/README.txt
new file mode 100644
index 000000000..6148f10fe
--- /dev/null
+++ b/debian-alt/jessie/README.txt
@@ -0,0 +1,3 @@
+If you have libjetty9-java from jessie-backports: use the stretch files in ../../debian.
+
+If you do not have libjetty9-java from jessie-backports: use the trusty files in ../trusty.
diff --git a/debian-alt/precise/control b/debian-alt/precise/control
index ee3f8a3d7..7bb482726 100644
--- a/debian-alt/precise/control
+++ b/debian-alt/precise/control
@@ -7,12 +7,12 @@ Bugs: mailto:zzz@i2pmail.org
 Homepage: https://geti2p.net/
 Build-Depends: debhelper (>= 7.0.50~)
  ,ant (>= 1.8)
- ,ant-optional
  ,debconf
  ,openjdk-7-jdk
 # Ant requires java 6 tools.jar:
 # Unable to locate tools.jar. Expected to find it in /usr/lib/jvm/java-6-openjdk-amd64/lib/tools.jar
  ,openjdk-6-jdk
+ ,libtomcat8-java
  ,glassfish-javaee
  ,dh-apparmor
  ,gettext
@@ -76,7 +76,7 @@ Section: net
 Priority: optional
 Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless,
- libecj-java,
+ libtomcat8-java,
  geoip-database,
  gettext-base,
  libgetopt-java,
diff --git a/debian-alt/precise/i2p-router.install b/debian-alt/precise/i2p-router.install
index 99683be0f..b67858d04 100644
--- a/debian-alt/precise/i2p-router.install
+++ b/debian-alt/precise/i2p-router.install
@@ -51,15 +51,14 @@ pkg-temp/lib/jetty-webapp.jar usr/share/i2p/lib
 pkg-temp/lib/jetty-xml.jar usr/share/i2p/lib
 pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
 pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
-# following two are from libservlet3.1-java which is a dependency of libjetty9-java
-pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
 
 
-# uncomment if not building with either libtomcat6-java or libtomcat7-java
-pkg-temp/lib/commons-el.jar usr/share/i2p/lib
+# uncomment if not building with libtomcat8-java
+#pkg-temp/lib/commons-el.jar usr/share/i2p/lib
 # legacy name, contains only tomcat-juli, not commons-logging
-pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
-pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
+#pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
+#pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
+#pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
 
 
 # uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java
diff --git a/debian-alt/precise/i2p-router.links b/debian-alt/precise/i2p-router.links
index 0ac85f6f5..d85cf86ee 100644
--- a/debian-alt/precise/i2p-router.links
+++ b/debian-alt/precise/i2p-router.links
@@ -3,8 +3,6 @@ usr/share/common-licenses/LGPL-2.1 usr/share/doc/i2p-router/licenses/LICENSE-LGP
 usr/share/common-licenses/Apache-2.0 usr/share/doc/i2p-router/licenses/LICENSE-Apache2.0.txt
 usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
 
-usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
-
 
 # comment out if not building with libjetty9-java
 # ubuntu: in trusty vivid wily xenial
@@ -33,6 +31,25 @@ usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
 #usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar
 
 
+# comment out if not building with libtomcat8-java
+# ubuntu: only in xenial+
+# debian: wheezy-backports, jessie+
+# legacy name, contains only tomcat-juli, not commons-logging
+usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar
+usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
+# combined into jasper-runtime.jar in non-package builds
+usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
+usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar
+usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar
+usr/share/java/tomcat8-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar
+# combined into commons-el.jar in non-package builds
+usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
+# legacy name in lib/
+usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
+usr/share/java/tomcat8-servlet-api.jar usr/share/i2p/lib/javax.servlet.jar
+usr/share/java/tomcat8-jsp-api.jar usr/share/i2p/lib/jsp-api.jar
+
+
 # comment out if not building with glassfish-javaee
 # glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
 #usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar
diff --git a/debian-alt/precise/rules b/debian-alt/precise/rules
index 2cb94b393..c3466db46 100755
--- a/debian-alt/precise/rules
+++ b/debian-alt/precise/rules
@@ -84,8 +84,8 @@ endif
 	@# debian and ubuntu: everywhere
 	@/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
 
-	@# ubuntu: not in precise
-	@# debian: in wheezy jessie stretch sid
+	@# ubuntu: in xenial
+	@# debian: in jessie-backports stretch sid
 	@#/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
 	@#mkdir -p $(CURDIR)/apps/jetty/jettylib
 	@#ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
@@ -106,6 +106,20 @@ endif
 	@#ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
 	@#ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
 
+	@# debian and ubuntu: wheezy-backports, jessie+, xenial+
+	@/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
+	mkdir -p $(CURDIR)/apps/jetty/jettylib
+	ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
+	ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
+	ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
+	ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
+	ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
+	ln -sf /usr/share/java/tomcat8-jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
+	ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
+	ln -sf /usr/share/java/tomcat8-servlet-api.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
+	ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
+	ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
+
 	@# debian and ubuntu: everywhere
 	@/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
 	@# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
diff --git a/debian-alt/trusty/control b/debian-alt/trusty/control
index 309b91de1..e5c9401ec 100644
--- a/debian-alt/trusty/control
+++ b/debian-alt/trusty/control
@@ -7,12 +7,12 @@ Bugs: mailto:zzz@i2pmail.org
 Homepage: https://geti2p.net/
 Build-Depends: debhelper (>= 7.0.50~)
  ,ant (>= 1.8)
- ,ant-optional
  ,debconf
  ,openjdk-7-jdk
 # Ant requires java 6 tools.jar:
 # Unable to locate tools.jar. Expected to find it in /usr/lib/jvm/java-6-openjdk-amd64/lib/tools.jar
  ,openjdk-6-jdk
+ ,libtomcat8-java
  ,dh-apparmor
  ,gettext
  ,libgetopt-java
@@ -75,7 +75,7 @@ Section: net
 Priority: optional
 Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless,
- libecj-java,
+ libtomcat8-java,
  geoip-database,
  gettext-base,
  libgetopt-java,
diff --git a/debian-alt/trusty/i2p-router.install b/debian-alt/trusty/i2p-router.install
index 431e32c87..b67858d04 100644
--- a/debian-alt/trusty/i2p-router.install
+++ b/debian-alt/trusty/i2p-router.install
@@ -51,15 +51,14 @@ pkg-temp/lib/jetty-webapp.jar usr/share/i2p/lib
 pkg-temp/lib/jetty-xml.jar usr/share/i2p/lib
 pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
 pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
-# following two are from libservlet3.0-java which is a dependency of libjetty9-java
-pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
 
 
 # uncomment if not building with libtomcat8-java
-pkg-temp/lib/commons-el.jar usr/share/i2p/lib
+#pkg-temp/lib/commons-el.jar usr/share/i2p/lib
 # legacy name, contains only tomcat-juli, not commons-logging
-pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
-pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
+#pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
+#pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
+#pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
 
 
 # uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java
diff --git a/debian-alt/trusty/i2p-router.links b/debian-alt/trusty/i2p-router.links
index 0ac85f6f5..d85cf86ee 100644
--- a/debian-alt/trusty/i2p-router.links
+++ b/debian-alt/trusty/i2p-router.links
@@ -3,8 +3,6 @@ usr/share/common-licenses/LGPL-2.1 usr/share/doc/i2p-router/licenses/LICENSE-LGP
 usr/share/common-licenses/Apache-2.0 usr/share/doc/i2p-router/licenses/LICENSE-Apache2.0.txt
 usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
 
-usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
-
 
 # comment out if not building with libjetty9-java
 # ubuntu: in trusty vivid wily xenial
@@ -33,6 +31,25 @@ usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
 #usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar
 
 
+# comment out if not building with libtomcat8-java
+# ubuntu: only in xenial+
+# debian: wheezy-backports, jessie+
+# legacy name, contains only tomcat-juli, not commons-logging
+usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar
+usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
+# combined into jasper-runtime.jar in non-package builds
+usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
+usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar
+usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar
+usr/share/java/tomcat8-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar
+# combined into commons-el.jar in non-package builds
+usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
+# legacy name in lib/
+usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
+usr/share/java/tomcat8-servlet-api.jar usr/share/i2p/lib/javax.servlet.jar
+usr/share/java/tomcat8-jsp-api.jar usr/share/i2p/lib/jsp-api.jar
+
+
 # comment out if not building with glassfish-javaee
 # glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
 #usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar
diff --git a/debian-alt/trusty/rules b/debian-alt/trusty/rules
index 19dc1fa0a..2de0f9840 100755
--- a/debian-alt/trusty/rules
+++ b/debian-alt/trusty/rules
@@ -83,8 +83,8 @@ endif
 	@# debian and ubuntu: everywhere
 	@/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
 
-	@# ubuntu: not in precise
-	@# debian: in wheezy jessie stretch sid
+	@# ubuntu: in xenial
+	@# debian: in jessie-backports stretch sid
 	@#/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
 	@#mkdir -p $(CURDIR)/apps/jetty/jettylib
 	@#ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
@@ -105,6 +105,20 @@ endif
 	@#ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
 	@#ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
 
+	@# debian and ubuntu: wheezy-backports, jessie+, xenial+
+	@/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
+	mkdir -p $(CURDIR)/apps/jetty/jettylib
+	ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
+	ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
+	ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
+	ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
+	ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
+	ln -sf /usr/share/java/tomcat8-jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
+	ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
+	ln -sf /usr/share/java/tomcat8-servlet-api.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
+	ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
+	ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
+
 	@# debian and ubuntu: everywhere
 	@/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
 	@# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
diff --git a/debian-alt/wheezy/README.txt b/debian-alt/wheezy/README.txt
new file mode 100644
index 000000000..4a2558050
--- /dev/null
+++ b/debian-alt/wheezy/README.txt
@@ -0,0 +1 @@
+Not maintained. Use the precise files instead.
diff --git a/debian-alt/wheezy/control b/debian-alt/wheezy/control
index c9f476c6c..0c0695d53 100644
--- a/debian-alt/wheezy/control
+++ b/debian-alt/wheezy/control
@@ -1,5 +1,5 @@
 Source: i2p
-Maintainer: Kill Your TV <killyourtv@i2pmail.org>
+Maintainer: zzz <zzz@i2pmail.org>
 Section: net
 Standards-Version: 3.9.6
 Priority: optional
@@ -7,9 +7,10 @@ Bugs: mailto:killyourtv@i2pmail.org
 Homepage: https://geti2p.net
 Build-Depends: debhelper (>= 7.0.50~)
  ,ant (>= 1.8)
- ,ant-optional
  ,debconf
- ,default-jdk | openjdk-7-jdk | openjdk-6-jdk
+ ,default-jdk | openjdk-7-jdk
+ ,libtomcat8-java
+ ,glassfish-javaee
  ,gettext
  ,dh-apparmor
  ,libgmp3-dev
@@ -71,7 +72,12 @@ Architecture: all
 Section: net
 Priority: optional
 Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
- openjdk-8-jre-headless | openjdk-7-jre-headless | openjdk-6-jre-headless | default-jre-headless | java8-runtime-headless | java7-runtime-headless | java6-runtime-headless, libecj-java
+ openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless,
+ libtomcat8-java,
+ geoip-database,
+ gettext-base,
+ libgetopt-java,
+ glassfish-javaee
 Replaces: i2p ( << 0.8.6-5)
 Breaks: i2p (<< 0.8.6-5)
 Recommends: libjbigi-jni, ttf-dejavu
diff --git a/debian-alt/xenial/control b/debian-alt/xenial/control
index 7798c677b..3fe552d46 100644
--- a/debian-alt/xenial/control
+++ b/debian-alt/xenial/control
@@ -7,7 +7,6 @@ Bugs: mailto:zzz@i2pmail.org
 Homepage: https://geti2p.net/
 Build-Depends: debhelper (>= 7.0.50~)
  ,ant (>= 1.8)
- ,ant-optional
  ,debconf
  ,openjdk-8-jdk
  ,libjetty9-java
diff --git a/debian-alt/xenial/rules b/debian-alt/xenial/rules
index 496c946d5..c70f19438 100755
--- a/debian-alt/xenial/rules
+++ b/debian-alt/xenial/rules
@@ -83,8 +83,8 @@ endif
 	@# debian and ubuntu: everywhere
 	@/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
 
-	@# ubuntu: not in precise
-	@# debian: in wheezy jessie stretch sid
+	@# ubuntu: in xenial
+	@# debian: in jessie-backports stretch sid
 	@/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
 	mkdir -p $(CURDIR)/apps/jetty/jettylib
 	ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
@@ -107,16 +107,16 @@ endif
 	ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
 
 	@# debian and ubuntu: wheezy-backports, jessie+, xenial+
-	/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
+	@/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
 	mkdir -p $(CURDIR)/apps/jetty/jettylib
-	ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
 	ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
+	ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
+	ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
+	ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
+	ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
+	ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
 	ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
 	ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
-	ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
-	ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
-	ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
-	ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
 
 	@# debian and ubuntu: everywhere
 	@/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
diff --git a/debian/control b/debian/control
index 03da0745b..d66594865 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Bugs: mailto:zzz@i2pmail.org
 Homepage: https://geti2p.net/
 Build-Depends: debhelper (>= 7.0.50~)
  ,ant (>= 1.8)
- ,ant-optional
  ,debconf
  ,openjdk-7-jdk
  ,libjetty9-java
diff --git a/debian/rules b/debian/rules
index d6bf372d0..00f0f6b93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,8 +83,8 @@ endif
 	@# debian and ubuntu: everywhere
 	@/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
 
-	@# ubuntu: not in precise
-	@# debian: in wheezy jessie stretch sid
+	@# ubuntu: in xenial
+	@# debian: in jessie-backports stretch sid
 	@/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
 	mkdir -p $(CURDIR)/apps/jetty/jettylib
 	ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
@@ -109,14 +109,14 @@ endif
 	@# debian and ubuntu: wheezy-backports, jessie+, xenial+
 	/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
 	mkdir -p $(CURDIR)/apps/jetty/jettylib
-	ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
 	ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
+	ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
+	ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
+	ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
+	ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
+	ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
 	ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
 	ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
-	ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
-	ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
-	ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
-	ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
 
 	@# debian and ubuntu: everywhere
 	@/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties