diff --git a/.tx/config b/.tx/config
index 9d62a923f..97fd1e1d2 100644
--- a/.tx/config
+++ b/.tx/config
@@ -404,7 +404,11 @@ trans.fr = installer/resources/locale-man/man_fr.po
 trans.it = installer/resources/locale-man/man_it.po
 trans.ko = installer/resources/locale-man/man_ko.po
 trans.nl = installer/resources/locale-man/man_nl.po
+trans.pl = installer/resources/locale-man/man_pl.po
 trans.pt = installer/resources/locale-man/man_pt.po
+trans.pt_BR = installer/resources/locale-man/man_pt_BR.po
+trans.ru_RU = installer/resources/locale-man/man_ru.po
+trans.sv_SE = installer/resources/locale-man/man_sv.po
 trans.zh_CN = installer/resources/locale-man/man_zh.po
 
 [main]
diff --git a/LICENSE.txt b/LICENSE.txt
index e0cb65de1..f2ff140ea 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.
@@ -284,7 +283,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/addressbook/build.xml b/apps/addressbook/build.xml
index eed69a3fa..bf4e52713 100644
--- a/apps/addressbook/build.xml
+++ b/apps/addressbook/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="addressbook" default="war" basedir=".">
+<project name="addressbook" default="all" basedir=".">
 
 	<property name="src" value="java/src"/>
 	<property name="build" value="build"/>
@@ -8,6 +8,8 @@
 	<property name="war" value="addressbook.war"/>
 	<property name="javac.compilerargs" value="" />
 	<property name="javac.version" value="1.7" />
+
+	<target name="all" depends="jar, emptyWar"/> 
 	
 	<target name="init">
 		<mkdir dir="${build}"/>
@@ -36,24 +38,10 @@
             </depend>
         </target>
 
-        <target name="dependServlet" if="depend.available">
-            <depend
-                cache="../../build"
-                srcdir="${src}"
-                destdir="${build}" >
-                <!-- Depend on classes instead of jars where available -->
-                <classpath>
-                    <pathelement location="../../core/java/build/obj" />
-                    <pathelement location="../jetty/jettylib/javax.servlet.jar" />
-                </classpath>
-            </depend>
-        </target>
-
-	<target name="compile" depends="init, depend">
+	<target name="compile" depends="init, depend, warUpToDate">
             <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
                        includeAntRuntime="false"
-                       srcdir="${src}" destdir="${build}"
-                       excludes="net/i2p/addressbook/Servlet.java">
+                       srcdir="${src}" destdir="${build}">
             <compilerarg line="${javac.compilerargs}" />
             <classpath>
                 <pathelement location="../../core/java/build/i2p.jar" />
@@ -61,20 +49,6 @@
 		</javac>
 	</target>
 
-	<target name="compileServlet" depends="init, dependServlet, compile">
-            <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
-                       includeAntRuntime="false"
-                       srcdir="${src}" destdir="${build}"
-                       includes="net/i2p/addressbook/Servlet.java">
-            <compilerarg line="${javac.compilerargs}" />
-            <classpath>
-                <pathelement location="../../core/java/build/i2p.jar" />
-                <pathelement location="../jetty/jettylib/javax.servlet.jar" />
-            </classpath>
-		</javac>
-	</target>
-
-        <!-- unused for now (except for Android), as we oddly ship addressbook as a .war -->
 	<target name="jar" depends="compile, changes">
 		<!-- set if unset -->
 		<property name="workspace.changes.tr" value="" />
@@ -91,29 +65,14 @@
 			</manifest>
 		</jar>
 	</target>
-	
-	<target name="war" depends="compileServlet, changes, warUpToDate" unless="war.uptodate">
-		<mkdir dir="${dist}/tmp"/>
-		<mkdir dir="${dist}/tmp/WEB-INF"/>
-		<mkdir dir="${dist}/tmp/WEB-INF/classes"/>
-		<copy todir="${dist}/tmp/WEB-INF/classes">
-			<fileset dir="${build}"/>
-		</copy>
-		<!-- set if unset -->
-		<property name="workspace.changes.tr" value="" />
-		<war basedir="${dist}/tmp" webxml="web.xml" destfile="${dist}/${war}">
-			<manifest>
-				<attribute name="Implementation-Version" value="${full.version}" />
-				<attribute name="Built-By" value="${build.built-by}" />
-		                <attribute name="Build-Date" value="${build.timestamp}" />
-		                <attribute name="Base-Revision" value="${workspace.version}" />
-		                <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
-				<attribute name="X-Compile-Source-JDK" value="${javac.version}" />
-				<attribute name="X-Compile-Target-JDK" value="${javac.version}" />
-			</manifest>
-		</war>
-		<delete dir="${dist}/tmp"/>
-	</target>
+
+        <target name="emptyWar" depends="init">
+            <jar destfile="${dist}/${war}" >
+                <manifest>
+                    <attribute name="Note" value="Intentionally empty" />
+                </manifest>
+            </jar>
+        </target>
 	
 	<target name="warUpToDate">
 	        <uptodate property="war.uptodate" targetfile="${dist}/${war}">
diff --git a/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
index 2fb20d2d7..36c9f6c0a 100644
--- a/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
@@ -43,13 +43,13 @@ import net.i2p.util.SystemVersion;
 
 /**
  * Main class of addressbook.  Performs updates, and runs the main loop.
+ * As of 0.9.30, package private, run with DaemonThread.
  * 
  * @author Ragnarok
  *
  */
-public class Daemon {
+class Daemon {
     public static final String VERSION = "2.0.4";
-    private static final Daemon _instance = new Daemon();
     private volatile boolean _running;
     private static final boolean DEBUG = false;
     private static final String DEFAULT_SUB = "http://i2p-projekt.i2p/hosts.txt";
@@ -787,14 +787,15 @@ public class Daemon {
      *            others are ignored.
      */
     public static void main(String[] args) {
+        Daemon daemon = new Daemon();
         if (args != null && args.length > 0 && args[0].equals("test"))
-            _instance.test(args);
+            daemon.test(args);
         else
-            _instance.run(args);
+            daemon.run(args);
     }
 
     /** @since 0.9.26 */
-    private static void test(String[] args) {
+    public static void test(String[] args) {
         Properties ctxProps = new Properties();
         String PROP_FORCE = "i2p.naming.blockfile.writeInAppContext";
         ctxProps.setProperty(PROP_FORCE, "true");
@@ -875,14 +876,14 @@ public class Daemon {
      * Call this to get the addressbook to reread its config and 
      * refetch its subscriptions.
      */
-    public static void wakeup() {
-        synchronized (_instance) {
-            _instance.notifyAll();
+    public void wakeup() {
+        synchronized (this) {
+            notifyAll();
         }
     }
 
-    public static void stop() {
-        _instance._running = false;
+    public void stop() {
+        _running = false;
         wakeup();
     }
 }
diff --git a/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java b/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
index 45a7893dd..a3ef36ce3 100644
--- a/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
@@ -36,6 +36,7 @@ import net.i2p.util.I2PAppThread;
 public class DaemonThread extends I2PAppThread implements NamingServiceUpdater {
 
     private final String[] args;
+    private final Daemon daemon;
 
     /**
      * Construct a DaemonThread with the command line arguments args.
@@ -44,6 +45,7 @@ public class DaemonThread extends I2PAppThread implements NamingServiceUpdater {
      */
     public DaemonThread(String[] args) {
         this.args = args;
+        daemon = new Daemon();
     }
 
     /* (non-Javadoc)
@@ -56,18 +58,28 @@ public class DaemonThread extends I2PAppThread implements NamingServiceUpdater {
         //} catch (InterruptedException exp) {
         //}
         I2PAppContext.getGlobalContext().namingService().registerUpdater(this);
-        Daemon.main(this.args);
-        I2PAppContext.getGlobalContext().namingService().unregisterUpdater(this);
+        try {
+            if (args != null && args.length > 0 && args[0].equals("test"))
+                daemon.test(args);
+            else
+                daemon.run(args);
+        } finally {
+            I2PAppContext.getGlobalContext().namingService().unregisterUpdater(this);
+        }
     }
 
     public void halt() {
-        Daemon.stop();
+        daemon.stop();
         interrupt();
     }
 
     /**
-     *  The NamingServiceUpdater interface
-     *  @param options ignored
+     *  The NamingServiceUpdater interface.
+     *  While this may be called directly, the recommended way
+     *  is to call I2PAppContext.namingService().requestUpdate(Properties)
+     *  which will call this.
+     *
+     *  @param options ignored, may be null
      *  @since 0.8.7
      */
     public void update(Properties options) {
diff --git a/apps/addressbook/web.xml b/apps/addressbook/web.xml
deleted file mode 100644
index d86d32289..000000000
--- a/apps/addressbook/web.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
-    "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
-
-<web-app>
-    <filter>
-        <filter-name>XSSFilter</filter-name>
-        <filter-class>net.i2p.servlet.filters.XSSFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>XSSFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-	<servlet>
-		<servlet-name>addressbook</servlet-name>
-		<servlet-class>net.i2p.addressbook.Servlet</servlet-class>
-		<init-param>
-		    <param-name>home</param-name>
-		    <param-value>./addressbook</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-    <servlet-mapping> 
-      <servlet-name>addressbook</servlet-name>
-      <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-
-    <!-- this webapp doesn't actually use sessions or cookies -->
-    <session-config>
-        <session-timeout>30</session-timeout>
-        <cookie-config>
-            <http-only>true</http-only>
-        </cookie-config>
-    </session-config>
-</web-app>
diff --git a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
index 58f27742b..9d0b3de32 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
@@ -70,6 +70,7 @@ public class I2PSnarkUtil {
     private boolean _areFilesPublic;
     private List<String> _openTrackers;
     private DHT _dht;
+    private long _startedTime;
 
     private static final int EEPGET_CONNECT_TIMEOUT = 45*1000;
     private static final int EEPGET_CONNECT_TIMEOUT_SHORT = 5*1000;
@@ -260,6 +261,8 @@ public class I2PSnarkUtil {
             if (opts.getProperty(I2PClient.PROP_SIGTYPE) == null)
                 opts.setProperty(I2PClient.PROP_SIGTYPE, "EdDSA_SHA512_Ed25519");
             _manager = I2PSocketManagerFactory.createManager(_i2cpHost, _i2cpPort, opts);
+            if (_manager != null)
+                _startedTime = _context.clock().now();
             _connecting = false;
         }
         if (_shouldUseDHT && _manager != null && _dht == null)
@@ -295,6 +298,7 @@ public class I2PSnarkUtil {
             _dht.stop();
             _dht = null;
         }
+        _startedTime = 0;
         I2PSocketManager mgr = _manager;
         // FIXME this can cause race NPEs elsewhere
         _manager = null;
@@ -310,6 +314,16 @@ public class I2PSnarkUtil {
         _tmpDir.mkdirs();
     }
     
+    /**
+     * When did we connect to the network?
+     * For RPC
+     * @return 0 if not connected
+     * @since 0.9.30
+     */
+    public long getStartedTime() {
+        return _startedTime;
+    }
+
     /** connect to the given destination */
     I2PSocket connect(PeerID peer) throws IOException {
         I2PSocketManager mgr = _manager;
diff --git a/apps/i2psnark/java/src/org/klomp/snark/Peer.java b/apps/i2psnark/java/src/org/klomp/snark/Peer.java
index d2658ee5d..79f26b7f8 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Peer.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Peer.java
@@ -89,6 +89,7 @@ public class Peer implements Comparable<Peer>
 */
   //private static final long OPTION_AZMP      = 0x1000000000000000l;
   private long options;
+  private final boolean _isIncoming;
 
   /**
    * Outgoing connection.
@@ -103,6 +104,7 @@ public class Peer implements Comparable<Peer>
     this.infohash = infohash;
     this.metainfo = metainfo;
     _id = __id.incrementAndGet();
+    _isIncoming = false;
     //_log.debug("Creating a new peer with " + peerID.toString(), new Exception("creating"));
   }
 
@@ -130,6 +132,16 @@ public class Peer implements Comparable<Peer>
     _id = __id.incrementAndGet();
     if (_log.shouldLog(Log.DEBUG))
         _log.debug("Creating a new peer " + peerID.toString(), new Exception("creating " + _id));
+    _isIncoming = true;
+  }
+
+  /**
+   * Is this an incoming connection?
+   * For RPC
+   * @since 0.9.30
+   */
+  public boolean isIncoming() {
+      return _isIncoming;
   }
 
   /**
diff --git a/apps/i2psnark/java/src/org/klomp/snark/Snark.java b/apps/i2psnark/java/src/org/klomp/snark/Snark.java
index 74f64a34c..350bab829 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java
@@ -28,6 +28,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
 import java.util.StringTokenizer;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import net.i2p.I2PAppContext;
 import net.i2p.client.streaming.I2PServerSocket;
@@ -237,8 +238,10 @@ public class Snark
   private volatile boolean _autoStoppable;
   // String indicating main activity
   private volatile String activity = "Not started";
-  private final long savedUploaded;
-
+  private long savedUploaded;
+  private long _startedTime;
+  private static final AtomicInteger __RPCID = new AtomicInteger();
+  private final int _rpcID = __RPCID.incrementAndGet();
 
   /**
    * from main() via parseArguments() single torrent
@@ -542,6 +545,7 @@ public class Snark
       starting = true;
       try {
           x_startTorrent();
+          _startedTime = _util.getContext().clock().now();
       } finally {
           starting = false;
       }
@@ -633,16 +637,17 @@ public class Snark
     if (st != null) {
         // TODO: Cache the config-in-mem to compare vs config-on-disk
         // (needed for auto-save to not double-save in some cases)
-        //boolean changed = storage.isChanged() || getUploaded() != savedUploaded;
-        boolean changed = true;
-        if (changed && completeListener != null)
-            completeListener.updateStatus(this);
+        long nowUploaded = getUploaded();
+        boolean changed = storage.isChanged() || nowUploaded != savedUploaded;
         try { 
             storage.close(); 
         } catch (IOException ioe) {
             System.out.println("Error closing " + torrent);
             ioe.printStackTrace();
         }
+        savedUploaded = nowUploaded;
+        if (changed && completeListener != null)
+            completeListener.updateStatus(this);
     }
     if (fast)
         // HACK: See above if(!fast)
@@ -1285,8 +1290,12 @@ public class Snark
 
     allChecked = true;
     checking = false;
-    if (storage.isChanged() && completeListener != null)
+    if (storage.isChanged() && completeListener != null) {
         completeListener.updateStatus(this);
+        // this saved the status, so reset the variables
+        storage.clearChanged();
+        savedUploaded = getUploaded();
+    }
   }
   
   public void storageCompleted(Storage storage)
@@ -1295,8 +1304,12 @@ public class Snark
         _log.info("Completely received " + torrent);
     //storage.close();
     //System.out.println("Completely received: " + torrent);
-    if (completeListener != null)
+    if (completeListener != null) {
         completeListener.torrentComplete(this);
+        // this saved the status, so reset the variables
+        savedUploaded = getUploaded();
+        storage.clearChanged();
+    }
   }
 
   public void setWantedPieces(Storage storage)
@@ -1364,4 +1377,23 @@ public class Snark
     long limit = 1024l * _util.getMaxUpBW();
     return total > limit;
   }
+
+  /**
+   *  A unique ID for this torrent, useful for RPC
+   *  @return positive value unless you wrap around
+   *  @since 0.9.30
+   */
+  public int getRPCID() {
+    return _rpcID;
+  }
+    
+    /**
+     * When did we start this torrent
+     * For RPC
+     * @return 0 if not started before. Not cleared when stopped.
+     * @since 0.9.30
+     */
+    public long getStartedTime() {
+        return _startedTime;
+    }
 }
diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index 39342e00f..448186ff6 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -27,7 +27,9 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingQueue;
 
 import net.i2p.I2PAppContext;
+import net.i2p.app.ClientApp;
 import net.i2p.app.ClientAppManager;
+import net.i2p.app.ClientAppState;
 import net.i2p.crypto.SHA1Hash;
 import net.i2p.crypto.SigType;
 import net.i2p.data.Base64;
@@ -51,7 +53,7 @@ import org.klomp.snark.dht.KRPC;
 /**
  * Manage multiple snarks
  */
-public class SnarkManager implements CompleteListener {
+public class SnarkManager implements CompleteListener, ClientApp {
     
     /**
      *  Map of (canonical) filename of the .torrent file to Snark instance.
@@ -246,6 +248,13 @@ public class SnarkManager implements CompleteListener {
      */
     public void start() {
         _running = true;
+        if ("i2psnark".equals(_contextName)) {
+            // Register with the ClientAppManager so the rpc plugin can find us
+            // only if default instance
+            ClientAppManager cmgr = _context.clientAppManager();
+            if (cmgr != null)
+                cmgr.register(this);
+        }
         _peerCoordinatorSet = new PeerCoordinatorSet();
         _connectionAcceptor = new ConnectionAcceptor(_util, _peerCoordinatorSet);
         _monitor = new I2PAppThread(new DirMonitor(), "Snark DirMonitor", true);
@@ -315,6 +324,12 @@ public class SnarkManager implements CompleteListener {
         _connectionAcceptor.halt();
         _idleChecker.cancel();
         stopAllTorrents(true);
+        if ("i2psnark".equals(_contextName)) {
+            // only if default instance
+            ClientAppManager cmgr = _context.clientAppManager();
+            if (cmgr != null)
+                cmgr.unregister(this);
+        }
         if (_log.shouldWarn())
             _log.warn("Snark stop() end");
     }
@@ -322,6 +337,46 @@ public class SnarkManager implements CompleteListener {
     /** @since 0.9.1 */
     public boolean isStopping() { return _stopping; }
 
+    /**
+     *  ClientApp method. Does nothing.
+     *  Doesn't matter, we are only registering.
+     *  @since 0.9.30
+     */
+    public void startup() {}
+
+    /**
+     *  ClientApp method. Does nothing.
+     *  Doesn't matter, we are only registering.
+     *  @since 0.9.30
+     */
+    public void shutdown(String[] args) {}
+
+    /**
+     *  ClientApp method.
+     *  Doesn't matter, we are only registering.
+     *  @return INITIALIZED always.
+     *  @since 0.9.30
+     */
+    public ClientAppState getState() {
+        return ClientAppState.INITIALIZED;
+    }
+
+    /**
+     *  ClientApp method.
+     *  @since 0.9.30
+     */
+    public String getName() {
+        return "i2psnark";
+    }
+
+    /**
+     *  ClientApp method.
+     *  @since 0.9.30
+     */
+    public String getDisplayName() {
+        return "i2psnark: " + _contextPath;
+    }
+
     /** hook to I2PSnarkUtil for the servlet */
     public I2PSnarkUtil util() { return _util; }
 
@@ -440,6 +495,14 @@ public class SnarkManager implements CompleteListener {
         return f; 
     }
 
+    /**
+     * For RPC
+     * @since 0.9.30
+     */
+    public File getConfigDir() { 
+        return _configDir; 
+    }
+
     /**
      *  Migrate the old flat config file to the new config dir
      *  containing the config file minus the per-torrent entries,
@@ -1526,9 +1589,9 @@ public class SnarkManager implements CompleteListener {
      * Called from servlet. This is only for the 'create torrent' form.
      *
      * @param metainfo the metainfo for the torrent
-     * @param bitfield the current completion status of the torrent
+     * @param bitfield the current completion status of the torrent, or null
      * @param filename the absolute path to save the metainfo to, generally ending in ".torrent", which is also the name of the torrent
-     *                 Must be a filesystem-safe name.
+     *                 Must be a filesystem-safe name. If null, will generate a name from the metainfo.
      * @param baseFile may be null, if so look in rootDataDir
      * @throws RuntimeException via Snark.fatal()
      * @return success
@@ -1542,10 +1605,18 @@ public class SnarkManager implements CompleteListener {
             if (snark != null) {
                 addMessage(_t("Torrent with this info hash is already running: {0}", snark.getBaseName()));
                 return false;
-            } else {
+            } else if (bitfield != null) {
                 saveTorrentStatus(metainfo, bitfield, null, baseFile, true, 0, true); // no file priorities
             }
             // so addTorrent won't recheck            
+            if (filename == null) {
+                File f = new File(getDataDir(), Storage.filterName(metainfo.getName()) + ".torrent");
+                if (f.exists()) {
+                    addMessage(_t("Failed to copy torrent file to {0}", f.getAbsolutePath()));
+                    _log.error("Torrent file already exists: " + f);
+                }
+                filename = f.getAbsolutePath();
+            }
             try {
                 locked_writeMetaInfo(metainfo, filename, areFilesPublic());
                 // hold the lock for a long time
diff --git a/apps/i2psnark/java/src/org/klomp/snark/Storage.java b/apps/i2psnark/java/src/org/klomp/snark/Storage.java
index 264602653..11825d09f 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java
@@ -305,6 +305,14 @@ public class Storage implements Closeable
       return changed;
   }
 
+  /**
+   *  Clear the storage changed variable
+   *  @since 0.9.30
+   */
+  void clearChanged() {
+      changed = false;
+  }
+
   /**
    *  File checking in progress.
    *  @since 0.9.3
diff --git a/apps/i2psnark/java/src/org/klomp/snark/dht/NodeInfo.java b/apps/i2psnark/java/src/org/klomp/snark/dht/NodeInfo.java
index 35d5761aa..f5bd718c8 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/dht/NodeInfo.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/dht/NodeInfo.java
@@ -106,11 +106,11 @@ class NodeInfo extends SimpleDataStructure {
         if (parts.length != 4)
             throw new DataFormatException("Bad format");
         byte[] nid = Base64.decode(parts[0]);
-        if (nid == null)
+        if (nid == null || nid.length != NID.HASH_LENGTH)
             throw new DataFormatException("Bad NID");
         nID = new NID(nid);
         byte[] h = Base64.decode(parts[1]);
-        if (h == null)
+        if (h == null || h.length != Hash.HASH_LENGTH)
             throw new DataFormatException("Bad hash");
         //hash = new Hash(h);
         hash = Hash.create(h);
diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index 96cffc4e6..3bb59807e 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -1803,6 +1803,8 @@ public class I2PSnarkServlet extends BasicServlet {
                     client = "Vuze" + getAzVersion(pid.getID());
                 else if ("CwsL".equals(ch))
                     client = "I2PSnarkXL";
+                else if ("LVhE".equals(ch))
+                    client = "XD" + getAzVersion(pid.getID());
                 else if ("ZV".equals(ch.substring(2,4)) || "VUZP".equals(ch))
                     client = "Robert" + getRobtVersion(pid.getID());
                 else if (ch.startsWith("LV")) // LVCS 1.0.2?; LVRS 1.0.4
diff --git a/apps/i2psnark/jetty-i2psnark.xml b/apps/i2psnark/jetty-i2psnark.xml
index 53d0e15e9..4a525ce8f 100644
--- a/apps/i2psnark/jetty-i2psnark.xml
+++ b/apps/i2psnark/jetty-i2psnark.xml
@@ -22,15 +22,24 @@
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
   <Call name="addConnector">
     <Arg>
-        <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
+        <New class="org.eclipse.jetty.server.ServerConnector">
+          <Arg><Ref id="Server" /></Arg>
+          <Arg type="int">1</Arg>     <!-- number of acceptors -->
+          <Arg type="int">0</Arg>     <!-- default number of selectors -->
+          <Arg>
+            <Array type="org.eclipse.jetty.server.ConnectionFactory">    <!-- varargs so we need an array -->
+              <Item>
+                <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                  <Arg>
+                    <New class="org.eclipse.jetty.server.HttpConfiguration" />
+                  </Arg>
+                </New>
+              </Item>
+            </Array>
+          </Arg>
           <Set name="host">127.0.0.1</Set>
           <Set name="port">8002</Set>
-          <Set name="maxIdleTime">600000</Set>
-          <Set name="Acceptors">1</Set>
-          <Set name="statsOn">false</Set>
-          <Set name="lowResourcesConnections">5000</Set>
-          <Set name="lowResourcesMaxIdleTime">5000</Set>
-          <Set name="useDirectBuffers">false</Set>
+          <Set name="idleTimeout">600000</Set>
         </New>
     </Arg>
   </Call>
@@ -96,7 +105,7 @@
     <Ref id="DeploymentManager">
       <Call name="addAppProvider">
         <Arg>
-          <New class="org.eclipse.jetty.deploy.providers.ContextProvider">
+          <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
             <Set name="monitoredDirName">./contexts</Set>
             <Set name="scanInterval">0</Set>
           </New>
diff --git a/apps/i2psnark/readme-standalone.txt b/apps/i2psnark/readme-standalone.txt
index fa35c65ee..7eb75c519 100644
--- a/apps/i2psnark/readme-standalone.txt
+++ b/apps/i2psnark/readme-standalone.txt
@@ -4,9 +4,24 @@ java -jar i2psnark.jar
 
 I2PSnark web ui will be at http://127.0.0.1:8002/i2psnark/ 
 
-Please note that http://127.0.0.1:8002/ will 404, to be fixed
-
 I2PSnark is GPL'ed software, based on Snark (http://www.klomp.org/) to run on top of I2P
 (https://geti2p.net/) within a webserver (such as the bundled Jetty from
 https://www.eclipse.org/jetty/).  For more information about I2PSnark, get in touch
 with the folks at http://forum.i2p2.de/
+
+
+To add RPC support:
+
+1) Stop i2psnark standalone if running.
+
+2a) If you have the i2psnark-rpc plugin installed in your router already,
+    copy the file ~/.i2p/plugins/i2psnark-rpc/console/webapps/transmission.war
+    to the webapps/ directory in your standalone install.
+
+2b) If you do not have the i2psnark-rpc plugin installed, get the i2p.plugins.i2psnark-rpc
+    branch out of monotone, build with 'ant war', and copy the file src/build/transmission.war.jar
+    to the file webapps/transmission.war in your standalone install.
+
+3) Start i2psnark standalone as usual. The transmission web interface will be at
+   http://127.0.0.1:8002/transmission/web/ or if you have transmission-remote installed,
+   test with 'transmission-remote 8002 -l'
diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index 93f5cc339..c9a3a74c1 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -277,14 +277,17 @@
             <classpath>
                 <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
                 <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
-                <!-- jsp-api.jar only present for debian builds -->
+
+                <!-- following jars only present for debian builds -->
                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
-                <!-- tomcat-api.jar only present for debian builds -->
                 <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
-                <!-- jasper-el.jar only present for debian builds -->
+                <pathelement location="../../jetty/jettylib/tomcat-util.jar" />
+                <pathelement location="../../jetty/jettylib/tomcat-util-scan.jar" />
+
                 <pathelement location="../../jetty/jettylib/jasper-el.jar" />
                 <pathelement location="../../jetty/jettylib/commons-logging.jar" />
                 <pathelement location="../../jetty/jettylib/commons-el.jar" />
+                <pathelement location="../../jetty/jettylib/jetty-util.jar" />
                 <pathelement location="${ant.home}/lib/ant.jar" />
                 <pathelement location="build/i2ptunnel.jar" />
                 <pathelement location="build/temp-beans.jar" />
@@ -309,12 +312,14 @@
             <classpath>
                 <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
                 <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
-                <!-- jsp-api.jar only present for debian builds -->
+
+                <!-- following jars only present for debian builds -->
                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
-                <!-- tomcat-api.jar only present for debian builds -->
                 <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
-                <!-- jasper-el.jar only present for debian builds -->
                 <pathelement location="../../jetty/jettylib/jasper-el.jar" />
+                <pathelement location="../../jetty/jettylib/tomcat-util.jar" />
+                <pathelement location="../../jetty/jettylib/tomcat-util-scan.jar" />
+
                 <pathelement location="../../jetty/jettylib/commons-logging.jar" />
                 <pathelement location="../../jetty/jettylib/commons-el.jar" />
                 <pathelement location="build/i2ptunnel.jar" />
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
index a3c9f8566..fa9d26736 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
@@ -313,8 +313,9 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
     }
 
     /**
-     *  Add a subsession to a shared client if necessary.
+     *  Add a DSA_SHA1 subsession to the shared client if necessary.
      *
+     *  @return subsession, or null if none was added
      *  @since 0.9.20
      */
     protected static synchronized I2PSession addSubsession(I2PTunnel tunnel) {
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
index 610c1fe24..cae60376d 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -204,7 +204,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
             "Proxy-Connection: close\r\n"+
             "\r\n" +
             "<html><body><H1>I2P ERROR: SSL to I2P address rejected</H1>" +
-            "SSL for to .i2p addresses denied by configuration." +
+            "SSL to .i2p addresses denied by configuration." +
             "You may change the configuration in I2PTunnel";
 
     /**
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCServer.java
index 87dd7e937..5da192609 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCServer.java
@@ -210,13 +210,13 @@ public class I2PTunnelIRCServer extends I2PTunnelServer implements Runnable {
                 _log.error("Error connecting to IRC server " + remoteHost + ':' + remotePort, ex);
         } catch (IOException ex) {
             try {
-                socket.close();
+                socket.reset();
             } catch (IOException ioe) {}
             if (_log.shouldLog(Log.WARN))
                 _log.warn("Error while receiving the new IRC Connection", ex);
         } catch (OutOfMemoryError oom) {
             try {
-                socket.close();
+                socket.reset();
             } catch (IOException ioe) {}
             if (_log.shouldLog(Log.ERROR))
                 _log.error("OOM in IRC server", oom);
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
index 46a030dd4..bd5df915a 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
@@ -18,6 +18,7 @@ import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 import java.security.GeneralSecurityException;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
@@ -29,12 +30,14 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.ThreadFactory;
 
 import net.i2p.I2PException;
+import net.i2p.client.I2PClient;
 import net.i2p.client.I2PSession;
 import net.i2p.client.I2PSessionException;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.client.streaming.I2PSocketManagerFactory;
+import net.i2p.crypto.SigType;
 import net.i2p.data.Base64;
 import net.i2p.data.Hash;
 import net.i2p.util.EventDispatcher;
@@ -67,6 +70,8 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
     private static final boolean DEFAULT_USE_POOL = true;
     public static final String PROP_USE_SSL = "useSSL";
     public static final String PROP_UNIQUE_LOCAL = "enableUniqueLocal";
+    /** @since 0.9.30 */
+    public static final String PROP_ALT_PKF = "altPrivKeyFile";
     /** apparently unused */
     protected static volatile long __serverId = 0;
     /** max number of threads  - this many slowlorisses will DOS this server, but too high could OOM the JVM */
@@ -217,6 +222,9 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
                                                                                     portNum, props);
             rv.setName("I2PTunnel Server");
             getTunnel().addSession(rv.getSession());
+            String alt = props.getProperty(PROP_ALT_PKF);
+            if (alt != null)
+                addSubsession(rv, alt);
             return rv;
         } catch (I2PSessionException ise) {
             throw new IllegalArgumentException("Can't create socket manager", ise);
@@ -225,6 +233,44 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
         }
     }
 
+    /**
+     *  Add a non-DSA_SHA1 subsession to the DSA_SHA1 server if necessary.
+     *
+     *  @return subsession, or null if none was added
+     *  @since 0.9.30
+     */
+    private I2PSession addSubsession(I2PSocketManager sMgr, String alt) {
+        File altFile = TunnelController.filenameToFile(alt);
+        if (alt == null)
+            return null;
+        I2PSession sess = sMgr.getSession();
+        if (sess.getMyDestination().getSigType() != SigType.DSA_SHA1)
+            return null;
+        Properties props = new Properties();
+        props.putAll(getTunnel().getClientOptions());
+        // fixme get actual sig type
+        String name = props.getProperty("inbound.nickname");
+        if (name != null)
+            props.setProperty("inbound.nickname", name + " (EdDSA)");
+        name = props.getProperty("outbound.nickname");
+        if (name != null)
+            props.setProperty("outbound.nickname", name + " (EdDSA)");
+        props.setProperty(I2PClient.PROP_SIGTYPE, "EdDSA_SHA512_Ed25519");
+        FileInputStream privData = null;
+        try {
+            privData = new FileInputStream(altFile);
+            return sMgr.addSubsession(privData, props);
+        } catch (IOException ioe) {
+            _log.error("Failed to add subssession", ioe);
+            return null;
+        } catch (I2PSessionException ise) {
+            _log.error("Failed to add subssession", ise);
+            return null;
+        } finally {
+            if (privData != null) try { privData.close(); } catch (IOException ioe) {}
+        }
+    }
+
 
     /**
      * Warning, blocks while connecting to router and building tunnels;
@@ -238,6 +284,22 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
         while (sockMgr.getSession().isClosed()) {
             try {
                 sockMgr.getSession().connect();
+                // Now connect the subsessions, if any
+                List<I2PSession> subs = sockMgr.getSubsessions();
+                if (!subs.isEmpty()) {
+                    for (I2PSession sub : subs) {
+                        try {
+                            sub.connect();
+                            if (_log.shouldInfo())
+                                _log.info("Connected subsession " + sub);
+                        } catch (I2PSessionException ise) {
+                            // not fatal?
+                            String msg = "Unable to connect subsession " + sub;
+                            this.l.log(msg);
+                            _log.error(msg, ise);
+                        }
+                    }
+                }
             } catch (I2PSessionException ise) {
                 // try to make this error sensible as it will happen...
                 String portNum = getTunnel().port;
@@ -618,7 +680,7 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
                           " [" + timeToHandle + ", socket create: " + (afterSocket-afterAccept) + "]");
         } catch (SocketException ex) {
             try {
-                socket.close();
+                socket.reset();
             } catch (IOException ioe) {}
             if (_log.shouldLog(Log.ERROR))
                 _log.error("Error connecting to server " + remoteHost + ':' + remotePort, ex);
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
index 9079efb01..1c1ed8c58 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
@@ -3,6 +3,7 @@ package net.i2p.i2ptunnel;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.security.GeneralSecurityException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -16,12 +17,22 @@ import net.i2p.I2PException;
 import net.i2p.client.I2PClient;
 import net.i2p.client.I2PClientFactory;
 import net.i2p.client.I2PSession;
+import net.i2p.client.I2PSessionException;
+import net.i2p.crypto.KeyGenerator;
 import net.i2p.crypto.SigType;
 import net.i2p.data.Destination;
+import net.i2p.data.KeyCertificate;
+import net.i2p.data.PrivateKey;
+import net.i2p.data.PrivateKeyFile;
+import net.i2p.data.PublicKey;
+import net.i2p.data.SigningPrivateKey;
+import net.i2p.data.SigningPublicKey;
+import net.i2p.data.SimpleDataStructure;
 import net.i2p.i2ptunnel.socks.I2PSOCKSTunnel;
 import net.i2p.util.FileUtil;
 import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
+import net.i2p.util.RandomSource;
 import net.i2p.util.SecureFile;
 import net.i2p.util.SecureFileOutputStream;
 import net.i2p.util.SystemVersion;
@@ -83,6 +94,8 @@ public class TunnelController implements Logging {
     private static final String OPT_TAGS_SEND = PFX_OPTION + "crypto.tagsToSend";
     private static final String OPT_LOW_TAGS = PFX_OPTION + "crypto.lowTagThreshold";
     private static final String OPT_SIG_TYPE = PFX_OPTION + I2PClient.PROP_SIGTYPE;
+    /** @since 0.9.30 */
+    private static final String OPT_ALT_PKF = PFX_OPTION + I2PTunnelServer.PROP_ALT_PKF;
 
     /** all of these @since 0.9.14 */
     public static final String TYPE_CONNECT = "connectclient";
@@ -106,7 +119,7 @@ public class TunnelController implements Logging {
      */
     public static final SigType PREFERRED_SIGTYPE;
     static {
-        if (SystemVersion.isARM() || SystemVersion.isGNU() || SystemVersion.isAndroid()) {
+        if (SystemVersion.isGNU() || SystemVersion.isAndroid()) {
             if (SigType.ECDSA_SHA256_P256.isAvailable())
                 PREFERRED_SIGTYPE = SigType.ECDSA_SHA256_P256;
             else
@@ -146,8 +159,13 @@ public class TunnelController implements Logging {
         setConfig(config, prefix);
         _messages = new ArrayList<String>(4);
         boolean keyOK = true;
-        if (createKey && (getType().endsWith("server") || getPersistentClientKey()))
+        if (createKey && (!isClient() || getPersistentClientKey())) {
             keyOK = createPrivateKey();
+            if (keyOK && !isClient() && !getType().equals(TYPE_STREAMR_SERVER)) {
+                // check rv?
+                createAltPrivateKey();
+            }
+        }
         _state = keyOK && getStartOnLoad() ? TunnelState.START_ON_LOAD : TunnelState.STOPPED;
     }
     
@@ -186,7 +204,7 @@ public class TunnelController implements Logging {
             String destStr = dest.toBase64();
             log("Private key created and saved in " + keyFile.getAbsolutePath());
             log("You should backup this file in a secure place.");
-            log("New destination: " + destStr);
+            log("New alternate destination: " + destStr);
             String b32 = dest.toBase32();
             log("Base32: " + b32);
             File backupDir = new SecureFile(I2PAppContext.getGlobalContext().getConfigDir(), KEY_BACKUP_DIR);
@@ -214,6 +232,101 @@ public class TunnelController implements Logging {
         return true;
     }
     
+    /**
+     * Creates alternate Destination with the same encryption keys as the primary Destination,
+     * but a different signing key.
+     *
+     * Must have already called createPrivateKey() successfully.
+     * Does nothing unless option OPT_ALT_PKF is set with the privkey file name.
+     * Does nothing if the file already exists.
+     *
+     * @return success
+     * @since 0.9.30
+     */
+    private boolean createAltPrivateKey() {
+        if (PREFERRED_SIGTYPE == SigType.DSA_SHA1)
+            return false;
+        File keyFile = getPrivateKeyFile();
+        if (keyFile == null)
+            return false;
+        if (!keyFile.exists())
+            return false;
+        File altFile = getAlternatePrivateKeyFile();
+        if (altFile == null)
+            return false;
+        if (altFile.equals(keyFile))
+            return false;
+        if (altFile.exists())
+            return true;
+        PrivateKeyFile pkf = new PrivateKeyFile(keyFile);
+        FileOutputStream out = null;
+        try {
+            Destination dest = pkf.getDestination();
+            if (dest == null)
+                return false;
+            if (dest.getSigType() != SigType.DSA_SHA1)
+                return false;
+            PublicKey pub = dest.getPublicKey();
+            PrivateKey priv = pkf.getPrivKey();
+            SimpleDataStructure[] signingKeys = KeyGenerator.getInstance().generateSigningKeys(PREFERRED_SIGTYPE);
+            SigningPublicKey signingPubKey = (SigningPublicKey) signingKeys[0];
+            SigningPrivateKey signingPrivKey = (SigningPrivateKey) signingKeys[1];
+            KeyCertificate cert = new KeyCertificate(signingPubKey);
+            Destination d = new Destination();
+            d.setPublicKey(pub);
+            d.setSigningPublicKey(signingPubKey);
+            d.setCertificate(cert);
+            int len = signingPubKey.length();
+            if (len < 128) {
+                byte[] pad = new byte[128 - len];
+                RandomSource.getInstance().nextBytes(pad);
+                d.setPadding(pad);
+            } else if (len > 128) {
+                // copy of excess data handled in KeyCertificate constructor
+            }
+        
+            out = new SecureFileOutputStream(altFile);
+            d.writeBytes(out);
+            priv.writeBytes(out);
+            signingPrivKey.writeBytes(out);
+            try { out.close(); } catch (IOException ioe) {}
+
+            String destStr = d.toBase64();
+            log("Alternate private key created and saved in " + altFile.getAbsolutePath());
+            log("You should backup this file in a secure place.");
+            log("New destination: " + destStr);
+            String b32 = d.toBase32();
+            log("Base32: " + b32);
+            File backupDir = new SecureFile(I2PAppContext.getGlobalContext().getConfigDir(), KEY_BACKUP_DIR);
+            if (backupDir.isDirectory() || backupDir.mkdir()) {
+                String name = b32 + '-' + I2PAppContext.getGlobalContext().clock().now() + ".dat";
+                File backup = new File(backupDir, name);
+                if (FileUtil.copy(altFile, backup, false, true)) {
+                    SecureFileOutputStream.setPerms(backup);
+                    log("Alternate private key backup saved to " + backup.getAbsolutePath());
+                }
+            }
+            return true;
+        } catch (GeneralSecurityException e) {
+            log("Error creating keys " + e);
+            return false;
+        } catch (I2PSessionException e) {
+            log("Error creating keys " + e);
+            return false;
+        } catch (I2PException e) {
+            log("Error creating keys " + e);
+            return false;
+        } catch (IOException e) {
+            log("Error creating keys " + e);
+            return false;
+        } catch (RuntimeException e) {
+            log("Error creating keys " + e);
+            return false;
+        } finally {
+            if (out != null) try { out.close(); } catch (IOException ioe) {}
+        }
+    }
+    
     public void startTunnelBackground() {
         synchronized (this) {
             if (_state != TunnelState.STOPPED && _state != TunnelState.START_ON_LOAD)
@@ -267,13 +380,17 @@ public class TunnelController implements Logging {
         }
         // Config options may have changed since instantiation, so do this again.
         // Or should we take it out of the constructor completely?
-        if (type.endsWith("server") || getPersistentClientKey()) {
+        if (!isClient() || getPersistentClientKey()) {
             boolean ok = createPrivateKey();
             if (!ok) {
                 changeState(TunnelState.STOPPED);
                 log("Failed to start tunnel " + getName() + " as the private key file could not be created");
                 return;
             }
+            if (!isClient() && !getType().equals(TYPE_STREAMR_SERVER)) {
+                // check rv?
+                createAltPrivateKey();
+            }
         }
         setI2CPOptions();
         setSessionOptions();
@@ -641,6 +758,7 @@ public class TunnelController implements Logging {
                 props.setProperty(key, val);
             }
         }
+        Properties oldConfig = _config;
         _config = props;
 
         // Set up some per-type defaults
@@ -685,6 +803,15 @@ public class TunnelController implements Logging {
                 return;
             }
         }
+
+        if (oldConfig != null) {
+            if (configChanged(_config, oldConfig, PROP_FILE) ||
+                configChanged(_config, oldConfig, OPT_ALT_PKF) ||
+                configChanged(_config, oldConfig, OPT_SIG_TYPE)) {
+                log("Tunnel must be stopped and restarted for private key file changes to take effect");
+            }
+        }
+
         // Running, so check sessions
         Collection<I2PSession> sessions = getAllSessions();
         if (sessions.isEmpty()) {
@@ -704,6 +831,17 @@ public class TunnelController implements Logging {
         }
     }
 
+    /**
+     *  Is property p different in p1 and p2?
+     *  @since 0.9.30
+     */
+    private static boolean configChanged(Properties p1, Properties p2, String p) {
+        String s1 = p1.getProperty(p);
+        String s2 = p2.getProperty(p);
+        return (s1 != null && !s1.equals(s2)) ||
+               (s1 == null && s2 != null);
+    }
+
     /**
      *  @return a copy
      */
@@ -797,7 +935,25 @@ public class TunnelController implements Logging {
      *  @since 0.9.17
      */
     public File getPrivateKeyFile() {
-        String f = getPrivKeyFile();
+        return filenameToFile(getPrivKeyFile());
+    }
+
+    /**
+     *  Does not necessarily exist.
+     *  @return absolute path or null if unset
+     *  @since 0.9.30
+     */
+    public File getAlternatePrivateKeyFile() {
+        return filenameToFile(_config.getProperty(OPT_ALT_PKF));
+    }
+
+    /**
+     *  Does not necessarily exist.
+     *  @param f relative or absolute path, may be null
+     *  @return absolute path or null
+     *  @since 0.9.30
+     */
+    static File filenameToFile(String f) {
         if (f == null)
             return null;
         f = f.trim();
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java
index 8010a110f..8b49b6995 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java
@@ -119,7 +119,7 @@ public class I2PTunnelDCCServer extends I2PTunnelServer {
                 _active.put(Integer.valueOf(myPort), local);
             } catch (SocketException ex) {
                 try {
-                    socket.close();
+                    socket.reset();
                 } catch (IOException ioe) {}
                 _log.error("Error relaying incoming DCC connection to IRC client at " + local.ia + ':' + local.port, ex);
             }
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SocketWrapper.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SocketWrapper.java
index e6b3b15f6..6e4ecc565 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SocketWrapper.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SocketWrapper.java
@@ -87,6 +87,14 @@ class SocketWrapper implements I2PSocket {
         socket.close();
     }
 
+    /** 
+     * Just calls close()
+     * @since 0.9.30
+     */
+    public void reset() throws IOException {
+        close();
+    }
+
     public boolean isClosed() {
         return socket.isClosed();
     }
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
index 26f4265e0..2a684c7e4 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
@@ -264,14 +264,23 @@ public class GeneralHelper {
         return (tun != null && tun.getSpoofedHost() != null) ? tun.getSpoofedHost() : "";
     }
 
+    /**
+     *  @return path, non-null, non-empty
+     */
     public String getPrivateKeyFile(int tunnel) {
         return getPrivateKeyFile(_group, tunnel);
     }
 
+    /**
+     *  @return path, non-null, non-empty
+     */
     public String getPrivateKeyFile(TunnelControllerGroup tcg, int tunnel) {
         TunnelController tun = getController(tcg, tunnel);
-        if (tun != null && tun.getPrivKeyFile() != null)
-            return tun.getPrivKeyFile();
+        if (tun != null) {
+            String rv = tun.getPrivKeyFile();
+            if (rv != null)
+                return rv;
+        }
         if (tunnel < 0)
             tunnel = tcg == null ? 999 : tcg.getControllers().size();
         String rv = "i2ptunnel" + tunnel + "-privKeys.dat";
@@ -284,6 +293,28 @@ public class GeneralHelper {
         return rv;
     }
 
+    /**
+     *  @return path or ""
+     *  @since 0.9.30
+     */
+    public String getAltPrivateKeyFile(int tunnel) {
+        return getAltPrivateKeyFile(_group, tunnel);
+    }
+
+    /**
+     *  @return path or ""
+     *  @since 0.9.30
+     */
+    public String getAltPrivateKeyFile(TunnelControllerGroup tcg, int tunnel) {
+        TunnelController tun = getController(tcg, tunnel);
+        if (tun != null) {
+            File f = tun.getAlternatePrivateKeyFile();
+            if (f != null)
+                return f.getAbsolutePath();
+        }
+        return "";
+    }
+
     public String getClientInterface(int tunnel) {
         TunnelController tun = getController(tunnel);
         if (tun != null) {
@@ -357,6 +388,29 @@ public class GeneralHelper {
         return null;
     }
 
+    /**
+     *  Works even if tunnel is not running.
+     *  @return Destination or null
+     *  @since 0.9.30
+     */
+    public Destination getAltDestination(int tunnel) {
+        TunnelController tun = getController(tunnel);
+        if (tun != null) {
+            // do this the hard way
+            File keyFile = tun.getAlternatePrivateKeyFile();
+            if (keyFile != null) {
+                PrivateKeyFile pkf = new PrivateKeyFile(keyFile);
+                try {
+                    Destination rv = pkf.getDestination();
+                    if (rv != null)
+                        return rv;
+                } catch (I2PException e) {
+                } catch (IOException e) {}
+            }
+        }
+        return null;
+    }
+
     public boolean shouldStartAutomatically(int tunnel) {
         TunnelController tun = getController(tunnel);
         return tun != null ? tun.getStartOnLoad() : false;
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
index 6dd91cce3..d381939a1 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
@@ -161,6 +161,16 @@ public class TunnelConfig {
     public String getPrivKeyFile() {
         return _privKeyFile;
     }
+
+    /**
+     *  What filename is this server tunnel's alternate private keys stored in
+     *  @since 0.9.30
+     */
+    public void setAltPrivKeyFile(String file) { 
+        if (file != null)
+            _otherOptions.put(I2PTunnelServer.PROP_ALT_PKF, file.trim());
+    }
+
     /**
      * If called with any value, we want this tunnel to start whenever it is
      * loaded (aka right now and whenever the router is started up)
@@ -725,7 +735,8 @@ public class TunnelConfig {
          PROP_MAX_CONNS_MIN, PROP_MAX_CONNS_HOUR, PROP_MAX_CONNS_DAY,
          PROP_MAX_TOTAL_CONNS_MIN, PROP_MAX_TOTAL_CONNS_HOUR, PROP_MAX_TOTAL_CONNS_DAY,
          PROP_MAX_STREAMS, I2PClient.PROP_SIGTYPE,
-        "inbound.randomKey", "outbound.randomKey", "i2cp.leaseSetSigningPrivateKey", "i2cp.leaseSetPrivateKey"
+        "inbound.randomKey", "outbound.randomKey", "i2cp.leaseSetSigningPrivateKey", "i2cp.leaseSetPrivateKey",
+         I2PTunnelServer.PROP_ALT_PKF
         };
     private static final String _httpServerOpts[] = {
         I2PTunnelHTTPServer.OPT_POST_WINDOW,
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
index f252faade..99317e54b 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
@@ -70,6 +70,14 @@ public class EditBean extends IndexBean {
     public String getPrivateKeyFile(int tunnel) {
         return _helper.getPrivateKeyFile(tunnel);
     }
+
+    /**
+     *  @return path or ""
+     *  @since 0.9.30
+     */
+    public String getAltPrivateKeyFile(int tunnel) {
+        return _helper.getAltPrivateKeyFile(tunnel);
+    }
     
 /****
     public String getNameSignature(int tunnel) {
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
index fe1c30b17..be841b817 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
@@ -488,6 +488,39 @@ public class IndexBean {
             return d.toBase32();
         return "";
     }
+
+    /**
+     *  Works even if tunnel is not running.
+     *  @return Destination or null
+     *  @since 0.9.30
+     */
+    protected Destination getAltDestination(int tunnel) {
+        return _helper.getAltDestination(tunnel);
+    }
+    
+    /**
+     *  Works even if tunnel is not running.
+     *  @return Base64 or ""
+     *  @since 0.9.30
+     */
+    public String getAltDestinationBase64(int tunnel) {
+        Destination d = getAltDestination(tunnel);
+        if (d != null)
+            return d.toBase64();
+        return "";
+    }
+    
+    /**
+     *  Works even if tunnel is not running.
+     *  @return "{52 chars}.b32.i2p" or ""
+     *  @since 0.9.30
+     */
+    public String getAltDestHashBase32(int tunnel) {
+        Destination d = getAltDestination(tunnel);
+        if (d != null)
+            return d.toBase32();
+        return "";
+    }
     
     /**
      *  For index.jsp
@@ -613,10 +646,20 @@ public class IndexBean {
     public void setSpoofedHost(String host) { 
         _config.setSpoofedHost(host);
     }
+
     /** What filename is this server tunnel's private keys stored in */
     public void setPrivKeyFile(String file) { 
         _config.setPrivKeyFile(file);
     }
+
+    /**
+     *  What filename is this server tunnel's alternate private keys stored in
+     *  @since 0.9.30
+     */
+    public void setAltPrivKeyFile(String file) { 
+        _config.setAltPrivKeyFile(file);
+    }
+
     /**
      * If called with any value (and the form submitted with action=Remove),
      * we really do want to stop and remove the tunnel.
diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp
index 0d41b2852..9d5704258 100644
--- a/apps/i2ptunnel/jsp/editServer.jsp
+++ b/apps/i2ptunnel/jsp/editServer.jsp
@@ -735,8 +735,9 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
             </div>
 <% **********************/ %>
 
-         <% if (true /* editBean.isAdvanced() */ ) {
-                int currentSigType = editBean.getSigType(curTunnel, tunnelType);
+         <%
+            int currentSigType = editBean.getSigType(curTunnel, tunnelType);
+            if (true /* editBean.isAdvanced() */ ) {
            %>
         <tr>
             <th colspan="2">
@@ -779,6 +780,50 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
 
          <% } // isAdvanced %>
 
+         <%
+            /* alternate dest, only if current dest is set and is DSA_SHA1 */
+
+            if (currentSigType == 0 && !"".equals(b64) && !"streamrserver".equals(tunnelType)) {
+          %><div id="privKeyField" class="rowItem">
+                <label for="privKeyFile"><%=intl._t("Alternate private key file")%> (Ed25519-SHA-512):</label>
+                <input type="text" size="30" id="privKeyFile" name="altPrivKeyFile" title="Path to Private Key File" value="<%=editBean.getAltPrivateKeyFile(curTunnel)%>" class="freetext" />               
+            </div>
+
+         <%
+              String ab64 = editBean.getAltDestinationBase64(curTunnel);
+              if (!"".equals(ab64)) {
+          %><div id="destinationField" class="rowItem">
+                <label for="localDestination"><%=intl._t("Alternate local destination")%>:</label>
+                <textarea rows="1" style="height: 3em;" cols="60" readonly="readonly" id="localDestination" title="Read Only: Alternate Local Destination" wrap="off" spellcheck="false"><%=ab64%></textarea>               
+            </div>
+            <div id="destinationField" class="rowItem">
+                <label> </label>
+                <span class="comment"><%=editBean.getAltDestHashBase32(curTunnel)%></span>
+            </div>
+            <div id="destinationField" class="rowItem">
+        <%
+                ab64 = ab64.replace("=", "%3d");
+                String name = editBean.getSpoofedHost(curTunnel);
+                if (name == null || name.equals(""))
+                    name = editBean.getTunnelName(curTunnel);
+                // mysite.i2p is set in the installed i2ptunnel.config
+                if (name != null && !name.equals("") && !name.equals("mysite.i2p") && !name.contains(" ") && name.endsWith(".i2p")) {
+           %><label>
+              <a class="control" title="<%=intl._t("Generate QR Code")%>" href="/imagegen/qr?s=320&amp;t=<%=name%>&amp;c=http%3a%2f%2f<%=name%>%2f%3fi2paddresshelper%3d<%=ab64%>" target="_top"><%=intl._t("Generate QR Code")%></a>
+              </label>
+              <a class="control" href="/susidns/addressbook.jsp?book=private&amp;hostname=<%=name%>&amp;destination=<%=ab64%>#add"><%=intl._t("Add to local addressbook")%></a>
+        <%
+                } else {
+            %><label> </label>
+              <span class="comment"><%=intl._t("Set name with .i2p suffix to enable QR code generation")%></span>
+        <%
+                }  // name
+          %></div>
+        <%
+              }  // ab64
+          %><div class="subdivider"><hr /></div>
+         <% } // currentSigType %>
+
         <tr>
             <th colspan="2">
                 <%=intl._t("Custom options")%>
diff --git a/apps/i2ptunnel/jsp/register.jsp b/apps/i2ptunnel/jsp/register.jsp
index d72b4e1d5..0b3c2aff1 100644
--- a/apps/i2ptunnel/jsp/register.jsp
+++ b/apps/i2ptunnel/jsp/register.jsp
@@ -91,6 +91,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
        }
 %>
 
+<!--
     <tr>
         <th>
             <b><%=intl._t("Local Destination")%></b>
@@ -101,6 +102,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
             <textarea rows="1" style="height: 3em;" cols="60" readonly="readonly" id="localDestination" title="Read Only: Local Destination (if known)" wrap="off" spellcheck="false"><%=editBean.getDestinationBase64(curTunnel)%></textarea>
         </td>
     </tr>
+-->
 
 <%
        if (b64 == null || b64.length() < 516) {
@@ -307,12 +309,40 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
     </tr>
 <%
                } else {
+                   // If set, use the configured alternate destination as the new alias destination,
+                   // and the configured primary destination as the inner signer.
+                   // This is backwards from all the other ones, so we have to make a second HostTxtEntry just for this.
+                   SigningPrivateKey spk3 = null;
+                   String altdest = null;
+                   String altdestfile = editBean.getAltPrivateKeyFile(curTunnel);
+                   if (altdestfile.length() > 0) {
+                       try {
+                           PrivateKeyFile pkf3 = new PrivateKeyFile(altdestfile);
+                           altdest = pkf3.getDestination().toBase64();
+                           if (!b64.equals(altdest)) {
+                               // disallow dup
+                               spk3 = pkf3.getSigningPrivKey();
+                           }
+                       } catch (Exception e) {}
+                   }
+                   if (spk3 != null) {
+                       OrderedProperties props2 = new OrderedProperties();
+                       HostTxtEntry he2 = new HostTxtEntry(name, altdest, props2);
+                       props2.setProperty(HostTxtEntry.PROP_ACTION, HostTxtEntry.ACTION_ADDDEST);
+                       props2.setProperty(HostTxtEntry.PROP_OLDDEST, b64);
+                       he2.signInner(spk);
+                       he2.sign(spk3);
+                %><tr><td><textarea rows="1" style="height: 3em;" cols="60" readonly="readonly" id="localDestination" title="Copy and paste this to the registration site" wrap="off" spellcheck="false"><% he2.write(out); %></textarea></td></tr>
+                <tr><td class="infohelp"><%=intl._t("This will add an alternate destination for {0}", name)%></td></tr>
+<%
+                   } else {
                 %><tr><td class="infohelp"><%=intl._t("This tunnel must be configured with the new destination.")%>
                   &nbsp;<%=intl._t("Enter old destination below.")%></td></tr>
 <%
-               }
+                   }  // spk3
+               }  // spk2
           %>
-          
+
 <%
 
 
diff --git a/apps/jetty/apache-tomcat-deployer/NOTICE b/apps/jetty/apache-tomcat-deployer/NOTICE
deleted file mode 100644
index 130d56e7d..000000000
--- a/apps/jetty/apache-tomcat-deployer/NOTICE
+++ /dev/null
@@ -1,22 +0,0 @@
-Apache Tomcat
-Copyright 1999-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-The Windows Installer is built with the Nullsoft
-Scriptable Install System (NSIS), which is
-open source software.  The original software and
-related information is available at
-http://nsis.sourceforge.net.
-
-Java compilation software for JSP pages is provided by the Eclipse
-JDT Core Batch Compiler component, which is open source software.
-The original software and related information is available at
-http://www.eclipse.org/jdt/core/.
-
-The original XML Schemas for Java EE Deployment Descriptors:
- - javaee_5.xsd
- - javaee_web_services_1_2.xsd
- - javaee_web_services_client_1_2.xsd
-may be obtained from http://java.sun.com/xml/ns/javaee/
diff --git a/apps/jetty/apache-tomcat-deployer/README-i2p.txt b/apps/jetty/apache-tomcat-deployer/README-i2p.txt
deleted file mode 100644
index 6b8c0edf3..000000000
--- a/apps/jetty/apache-tomcat-deployer/README-i2p.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1.
-The Glassfish JSP 2.1 bundled in Jetty 6 is way too old.
-
-Retrieved from the file
-	apache-tomcat-6.0.48-deployer.tar.gz
-
-minus the following files and directores:
-
-	build.xml
-	deployer-howto.html
-	images/*
-	lib/catalina*
-	lib/jsp-api.jar (see below)
-	lib/servlet-api.jar (see below)
-	LICENSE (see ../../../licenses/LICENSE-Apache2.0.txt, it's also inside every jar)
-	RELEASE-NOTES
-
-
-We could use the following API jars from Apache Tomcat 7.x, supporting Servlet 3.0 and JSP 2.2,
-that are required for Jetty 8, but we just bundle the ones from Jetty 8 instead:
-
-	lib/jsp-api.jar
-	lib/servlet-api.jar
-
-For more info:
-http://tomcat.apache.org/whichversion.html
diff --git a/apps/jetty/apache-tomcat-deployer/lib/el-api.jar b/apps/jetty/apache-tomcat-deployer/lib/el-api.jar
deleted file mode 100644
index 2598a4a8f..000000000
Binary files a/apps/jetty/apache-tomcat-deployer/lib/el-api.jar and /dev/null differ
diff --git a/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar b/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar
deleted file mode 100644
index b7205e347..000000000
Binary files a/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar and /dev/null differ
diff --git a/apps/jetty/apache-tomcat-deployer/lib/jasper.jar b/apps/jetty/apache-tomcat-deployer/lib/jasper.jar
deleted file mode 100644
index ca2d7269d..000000000
Binary files a/apps/jetty/apache-tomcat-deployer/lib/jasper.jar and /dev/null differ
diff --git a/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar b/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar
deleted file mode 100644
index c5e0f8f77..000000000
Binary files a/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar and /dev/null differ
diff --git a/apps/jetty/apache-tomcat/README-i2p.txt b/apps/jetty/apache-tomcat/README-i2p.txt
deleted file mode 100644
index 015ff4736..000000000
--- a/apps/jetty/apache-tomcat/README-i2p.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1.
-
-Retrieved from the file
-	apache-tomcat-6.0.48.tar.gz
-
-containing only a small subset of lib/tomcat-coyote.jar.
-
-See the buildTomcatUtilJar target in ../build.xml for the classes extracted and more information.
-
-LICENSE: see ../../../licenses/LICENSE-Apache2.0.txt
diff --git a/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar b/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar
deleted file mode 100644
index a45499414..000000000
Binary files a/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar and /dev/null differ
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index 47b88cb5d..f3de9bffa 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -3,7 +3,7 @@
 
     <!-- This copies jars, with some modifications and renaming,
          from the jetty-distribution directory to the jettylib directory.
-         This is disabled if the property with-libjetty8-java=true.
+         This is disabled if the property with-libjetty9-java=true.
 
          This copies jars, with some modifications and renaming,
          from the apache-tomcat-deployer and apache-tomcat directories to the jettylib directory.
@@ -14,18 +14,17 @@
      -->
 
     <!-- Note: Please change all references in top-level build.xml if you update to a new Jetty! -->
-    <property name="jetty.ver" value="8.1.21.v20160908" />
+    <!-- unused until we go to 9.3 -->
+    <property name="jetty.branch" value="stable-9" />
+    <property name="jetty.ver" value="9.2.21.v20170120" />
     <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
-    <property name="jetty.sha1" value="9780e99e765fd7b9bb1aac8ba2bba374ac039764" />
+    <property name="jetty.sha1" value="3dcd4f66cc3f72800a2ee53fecf7b3f9d3f23eb2" />
     <property name="jetty.filename" value="${jetty.base}.zip" />
-    <property name="jetty.url" value="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty.ver}/${jetty.filename}" />
+    <!-- change jetty.ver to jetty.branch for 9.3 -->
+    <property name="jetty.url" value="http://central.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty.ver}/${jetty.filename}" />
     <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" />
 
@@ -41,7 +40,7 @@
     <target name="ensureJettylib1" >
         <condition property="jetty.zip.extracted" >
             <or>
-                <istrue value="${with-libjetty8-java}" />
+                <istrue value="${with-libjetty9-java}" />
                 <available file="${jetty.base}" type="dir" />
             </or>
         </condition>
@@ -53,7 +52,7 @@
         </condition>
         <condition property="verified.already" >
             <or>
-                <istrue value="${with-libjetty8-java}" />
+                <istrue value="${with-libjetty9-java}" />
                 <istrue value="${jetty.zip.extracted}" />
                 <and>
                     <available file="${jetty.filename}" />
@@ -120,10 +119,17 @@
     </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-libjetty8-java}" >
+    <target name="copyJettylib1" depends="extractJettylib" unless="${with-libjetty9-java}" >
       <!-- We copy everything to names without the version numbers so we
            can update them later. Where there was something similar in Jetty 5/6,
            we use the same names so they will overwrite the Jetty 5/6 jar on upgrade.
@@ -166,43 +172,29 @@
                 <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.0.jar" />
-            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar" />
+            <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" />
+          <!--
+            Jetty version - see below for why we don't use this one
+            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/javax.servlet.jsp-api-2.3.1.jar" />
+           -->
+            <!-- Apache version -->
+            <!-- Also includes org.apache.*, this is copied into jasper-runtime.jar below -->
+            <zipfileset includes="javax/**/*" src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar"/>
+            <!-- In Debian packages they are found in /usr/share/java/tomcat8-servlet-api.jar in the libtomcat8-java package -->
+            <!-- javax/servlet/jsp/resources are dups of those in apache-jsp jar -->
+            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties javax/servlet/jsp/resources/*" src="${jetty.base}/lib/jetty-schemas-3.1.jar" />
         </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,
-             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.
-     -->
-    <target name="buildTomcatUtilJar" unless="${with-libservlet2.5-java}" >
-        <!-- take only what we need from the tomcat-coyote jar -->
-        <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.
@@ -221,7 +213,7 @@
      -->
     <target name="copyTomcatLib" depends="mkJettylibdir, copyTomcatLib1, copyTomcatLib2, copyTomcatLib3" />
 
-    <target name="copyTomcatLib1" unless="${with-libservlet2.5-java}" >
+    <target name="copyTomcatLib1" >
         <condition property="with-libtomcat-java" >
             <or>
                 <istrue value="${with-libtomcat6-java}" />
@@ -233,34 +225,47 @@
 
 
     <target name="copyTomcatLib2" unless="${with-libtomcat-java}" >
-        <!-- EL libs.
+        <!-- EL API and compiler libs.
              Tomcat 6 has EL 2.1.
              Tomcat 7 / libservlet3.0 has EL 2.2.
+             Jetty 9 / Tomcat 8 / libservlet3.1 has EL 3.0.
              According to http://stackoverflow.com/questions/7202686/differences-between-el-2-1-and-2-2
              2.2 is backwards-compatible with 2.1.
          -->
-        <jar destfile="jettylib/commons-el.jar" duplicate="preserve" filesetmanifest="merge" >
-            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper-el.jar" />
-            <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/el-api.jar" />
+        <!-- the javax.el API, AND the com.sun.el parser -->
+        <!-- actually from jetty9, not tomcat8... this will fail unless we have the jetty files also -->
+        <jar destfile="jettylib/commons-el.jar" >
+          <!--
+            Jetty version
+            <zipfileset src="${jetty.base}/lib/jsp/javax.el-3.0.0.jar"/>
+           -->
+            <!-- Apache version -->
+            <zipfileset src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.33.jar"/>
         </jar>
 
-        <jar destfile="jettylib/jasper-runtime.jar" filesetmanifest="merge" >
-            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper.jar" />
-            <zipfileset src="${tomcat2.lib.small}/tomcat-coyote-util.jar" />
+        <!-- actually from jetty9, not tomcat8... this will fail unless we have the jetty files also -->
+        <jar destfile="jettylib/jasper-runtime.jar" >
+          <!--
+            Jetty version
+            <zipfileset src="${jetty.base}/lib/jsp/javax.servlet.jsp-2.3.2.jar"/>
+            To be included in jasper-runtime.jar?
+            Server complains "NO JSP Support for /, did not find org.eclipse.jetty.jsp.JettyJspServlet" even with this included (but it still works).
+            The following file has the class, but /usr/share/java/jetty8-jsp.jar is empty
+            We don't use this one, because we want to be consistent with Debian builds that
+            must use Apache (aka libtomcat8).
+            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/jetty-jsp-${jetty.ver}.jar" />
+           -->
+            <!-- Apache version -->
+            <!-- Also includes javax.servlet.jsp.*, this is copied into javax.servlet.jar above -->
+            <zipfileset includes="org/**/*" src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar"/>
+            <!-- required Jetty initializer (see RouterConsoleRunner) -->
+            <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>
         </jar>
     </target>
 
diff --git a/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java b/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java
index 28b011561..158696397 100644
--- a/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java
+++ b/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java
@@ -263,4 +263,11 @@ public class I2PLogger implements Logger
     public String getName() {
         return "net.i2p.jetty.I2PLogger";
     }
+
+    /**
+     *  @since Jetty 9
+     */
+    public void debug(String msg, long arg) {
+        debug(msg, Long.valueOf(arg), null);
+    }
 }
diff --git a/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
index 222960780..83c82b591 100644
--- a/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
+++ b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
@@ -24,7 +24,6 @@ import java.util.TimeZone;
 
 import javax.servlet.http.Cookie;
 
-import org.eclipse.jetty.http.HttpHeaders;
 import org.eclipse.jetty.http.PathMap;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.RequestLog;
@@ -81,7 +80,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
     private transient OutputStream _out;
     private transient OutputStream _fileOut;
     private transient DateCache _logDateCache;
-    private transient PathMap _ignorePathMap;
+    private transient PathMap<String> _ignorePathMap;
     private transient Writer _writer;
     private transient ArrayList<Utf8StringBuilder> _buffers;
     private transient char[] _copy;
@@ -286,7 +285,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
                 String addr = null;
                 if (_preferProxiedForAddress) 
                 {
-                    addr = request.getHeader(HttpHeaders.X_FORWARDED_FOR);
+                    addr = request.getHeader("X-Forwarded-For");
                 }
 
                 if (addr == null) {
@@ -310,7 +309,9 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
                 if (_logDateCache!=null)
                     buf.append(_logDateCache.format(request.getTimeStamp()));
                 else
-                    buf.append(request.getTimeStampBuffer().toString());
+                    //buf.append(request.getTimeStampBuffer().toString());
+                    // TODO SimpleDateFormat or something
+                    buf.append(request.getTimeStamp());
                     
                 buf.append("] \"");
                 buf.append(request.getMethod());
@@ -358,7 +359,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
             {
                 synchronized(_writer)
                 {
-                    buf.append(StringUtil.__LINE_SEPARATOR);
+                    buf.append(System.getProperty("line.separator", "\n"));
                     int l=buf.length();
                     if (l>_copy.length)
                         l=_copy.length;  
@@ -412,7 +413,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
                         _writer.write(Long.toString(System.currentTimeMillis() - request.getTimeStamp()));
                     }
 
-                    _writer.write(StringUtil.__LINE_SEPARATOR);
+                    _writer.write(System.getProperty("line.separator", "\n"));
                     _writer.flush();
                 }
             }
@@ -429,7 +430,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
                                Response response, 
                                Writer writer) throws IOException 
     {
-        String referer = request.getHeader(HttpHeaders.REFERER);
+        String referer = request.getHeader("Referer");
         if (referer == null) 
             writer.write("\"-\" ");
         else 
@@ -439,7 +440,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
             writer.write("\" ");
         }
         
-        String agent = request.getHeader(HttpHeaders.USER_AGENT);
+        String agent = request.getHeader("User-Agent");
         if (agent == null)
             writer.write("\"-\" ");
         else
@@ -455,8 +456,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
     {
         if (_logDateFormat!=null)
         {       
-            _logDateCache = new DateCache(_logDateFormat, _logLocale);
-            _logDateCache.setTimeZoneID(_logTimeZone);
+            _logDateCache = new DateCache(_logDateFormat, _logLocale, _logTimeZone);
         }
         
         if (_filename != null) 
@@ -472,7 +472,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
         
         if (_ignorePaths != null && _ignorePaths.length > 0)
         {
-            _ignorePathMap = new PathMap();
+            _ignorePathMap = new PathMap<String>();
             for (int i = 0; i < _ignorePaths.length; i++) 
                 _ignorePathMap.put(_ignorePaths[i], _ignorePaths[i]);
         }
diff --git a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
index 2c1b6c255..f068a20c0 100644
--- a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
+++ b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
@@ -30,6 +30,7 @@ import net.i2p.util.I2PAppThread;
 import net.i2p.util.PortMapper;
 
 import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.util.component.LifeCycle;
 import org.eclipse.jetty.util.resource.Resource;
@@ -130,13 +131,17 @@ public class JettyStart implements ClientApp {
                                 Server server = (Server) lc;
                                 Connector[] connectors = server.getConnectors();
                                 if (connectors.length > 0) {
-                                    int port = connectors[0].getPort();
-                                    if (port > 0) {
-                                        _port = port;
-                                        String host = connectors[0].getHost();
-                                        if (host.equals("0.0.0.0") || host.equals("::"))
-                                            host = "127.0.0.1";
-                                        _context.portMapper().register(PortMapper.SVC_EEPSITE, host, port);
+                                    Connector conn = connectors[0];
+                                    if (conn instanceof NetworkConnector) {
+                                        NetworkConnector nconn = (NetworkConnector) conn;
+                                        int port = nconn.getPort();
+                                        if (port > 0) {
+                                            _port = port;
+                                            String host = nconn.getHost();
+                                            if (host.equals("0.0.0.0") || host.equals("::"))
+                                                host = "127.0.0.1";
+                                            _context.portMapper().register(PortMapper.SVC_EEPSITE, host, port);
+                                        }
                                     }
                                 }
                             }
diff --git a/apps/jetty/java/src/org/mortbay/servlet/MultiPartRequest.java b/apps/jetty/java/src/org/mortbay/servlet/MultiPartRequest.java
index 0091d5d8a..566b7d3e1 100644
--- a/apps/jetty/java/src/org/mortbay/servlet/MultiPartRequest.java
+++ b/apps/jetty/java/src/org/mortbay/servlet/MultiPartRequest.java
@@ -49,6 +49,7 @@ import org.mortbay.util.LineInput;
  * </pre>
  *
  * Modded to compile with Jetty 6 for I2P
+ * Modded to make fields private and final
  *
  * @version $Id: MultiPartRequest.java,v 1.16 2005/12/02 20:13:52 gregwilkins Exp $
  * @author  Greg Wilkins
@@ -59,14 +60,14 @@ public class MultiPartRequest
     //private static Log log = LogFactory.getLog(MultiPartRequest.class);
 
     /* ------------------------------------------------------------ */
-    HttpServletRequest _request;
-    LineInput _in;
-    String _boundary;
-    String _encoding;
-    byte[] _byteBoundary;
-    MultiMap<String> _partMap = new MultiMap<String>(10);
-    int _char=-2;
-    boolean _lastPart=false;
+    private final HttpServletRequest _request;
+    private final LineInput _in;
+    private final String _boundary;
+    private final String _encoding;
+    private final byte[] _byteBoundary;
+    private final MultiMap<String> _partMap = new MultiMap<String>(10);
+    private int _char=-2;
+    private boolean _lastPart=false;
     
     /* ------------------------------------------------------------ */
     /** Constructor. 
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-continuation-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-continuation-8.1.21.v20160908.jar
deleted file mode 100644
index ef8b5f4dc..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-continuation-8.1.21.v20160908.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-deploy-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-deploy-8.1.21.v20160908.jar
deleted file mode 100644
index 1df83b801..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-deploy-8.1.21.v20160908.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-http-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-http-8.1.21.v20160908.jar
deleted file mode 100644
index 6bbb4224c..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-http-8.1.21.v20160908.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-io-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-io-8.1.21.v20160908.jar
deleted file mode 100644
index 502691d37..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-io-8.1.21.v20160908.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-jmx-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-jmx-8.1.21.v20160908.jar
deleted file mode 100644
index 9a5a03090..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-jmx-8.1.21.v20160908.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-rewrite-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-rewrite-8.1.21.v20160908.jar
deleted file mode 100644
index a2a145408..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-rewrite-8.1.21.v20160908.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-security-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-security-8.1.21.v20160908.jar
deleted file mode 100644
index dcacc12ad..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-security-8.1.21.v20160908.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-server-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-server-8.1.21.v20160908.jar
deleted file mode 100644
index 0a99f8497..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-server-8.1.21.v20160908.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-servlet-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-servlet-8.1.21.v20160908.jar
deleted file mode 100644
index 1e563538c..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-servlet-8.1.21.v20160908.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-servlets-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-servlets-8.1.21.v20160908.jar
deleted file mode 100644
index 28e4fe6c2..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-servlets-8.1.21.v20160908.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-util-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-util-8.1.21.v20160908.jar
deleted file mode 100644
index 646b23b0f..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-util-8.1.21.v20160908.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-webapp-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-webapp-8.1.21.v20160908.jar
deleted file mode 100644
index b8d340f32..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-webapp-8.1.21.v20160908.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-xml-8.1.21.v20160908.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-xml-8.1.21.v20160908.jar
deleted file mode 100644
index 1bedc9e62..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jetty-xml-8.1.21.v20160908.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar
deleted file mode 100644
index dc2fbb0da..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/servlet-api-3.0.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/servlet-api-3.0.jar
deleted file mode 100644
index b13540968..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.21.v20160908/lib/servlet-api-3.0.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.21.v20160908/start.jar b/apps/jetty/jetty-distribution-8.1.21.v20160908/start.jar
deleted file mode 100644
index 43442c445..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.21.v20160908/start.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.21.v20170120.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.21.v20170120.jar
new file mode 100644
index 000000000..5a6cc108e
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.21.v20170120.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.33.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.33.jar
new file mode 100644
index 000000000..32a98131e
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.33.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar
new file mode 100644
index 000000000..3577b5a06
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-continuation-9.2.21.v20170120.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-continuation-9.2.21.v20170120.jar
new file mode 100644
index 000000000..4aac6404c
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-continuation-9.2.21.v20170120.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-deploy-9.2.21.v20170120.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-deploy-9.2.21.v20170120.jar
new file mode 100644
index 000000000..d535a6b2e
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-deploy-9.2.21.v20170120.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-http-9.2.21.v20170120.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-http-9.2.21.v20170120.jar
new file mode 100644
index 000000000..507952734
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-http-9.2.21.v20170120.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-io-9.2.21.v20170120.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-io-9.2.21.v20170120.jar
new file mode 100644
index 000000000..5eafefc7c
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-io-9.2.21.v20170120.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-jmx-9.2.21.v20170120.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-jmx-9.2.21.v20170120.jar
new file mode 100644
index 000000000..5f11c2fd4
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-jmx-9.2.21.v20170120.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-rewrite-9.2.21.v20170120.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-rewrite-9.2.21.v20170120.jar
new file mode 100644
index 000000000..ea2adc1f8
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-rewrite-9.2.21.v20170120.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-schemas-3.1.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-schemas-3.1.jar
new file mode 100644
index 000000000..7166da3f8
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-schemas-3.1.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-security-9.2.21.v20170120.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-security-9.2.21.v20170120.jar
new file mode 100644
index 000000000..f54d07c38
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-security-9.2.21.v20170120.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-server-9.2.21.v20170120.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-server-9.2.21.v20170120.jar
new file mode 100644
index 000000000..8a4c5fad4
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-server-9.2.21.v20170120.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-servlet-9.2.21.v20170120.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-servlet-9.2.21.v20170120.jar
new file mode 100644
index 000000000..4fd13be32
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-servlet-9.2.21.v20170120.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-servlets-9.2.21.v20170120.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-servlets-9.2.21.v20170120.jar
new file mode 100644
index 000000000..c11519c1a
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-servlets-9.2.21.v20170120.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-util-9.2.21.v20170120.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-util-9.2.21.v20170120.jar
new file mode 100644
index 000000000..edf6b9bea
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-util-9.2.21.v20170120.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-webapp-9.2.21.v20170120.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-webapp-9.2.21.v20170120.jar
new file mode 100644
index 000000000..a7f7dcd76
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-webapp-9.2.21.v20170120.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-xml-9.2.21.v20170120.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-xml-9.2.21.v20170120.jar
new file mode 100644
index 000000000..f82eba9cf
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/jetty-xml-9.2.21.v20170120.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/servlet-api-3.1.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/servlet-api-3.1.jar
new file mode 100644
index 000000000..6b14c3d26
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/lib/servlet-api-3.1.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.21.v20170120/start.jar b/apps/jetty/jetty-distribution-9.2.21.v20170120/start.jar
new file mode 100644
index 000000000..4dc45c3b9
Binary files /dev/null and b/apps/jetty/jetty-distribution-9.2.21.v20170120/start.jar differ
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocket.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocket.java
index 7c7c0b19c..d38afc689 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocket.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocket.java
@@ -112,6 +112,20 @@ public interface I2PSocket extends Closeable {
      *  @since 0.8.9
      */
     public int getLocalPort();
+    
+    /**
+     *  Resets and closes this socket. Sends a RESET indication to the far-end.
+     *  This is the equivalent of setSoLinger(true, 0) followed by close() on a Java Socket.
+     *
+     *  Nonblocking.
+     *  Any thread currently blocked in an I/O operation upon this socket will throw an IOException.
+     *  Once a socket has been reset, it is not available for further networking use
+     *  (i.e. can't be reconnected or rebound). A new socket needs to be created.
+     *  Resetting this socket will also close the socket's InputStream and OutputStream.
+     *
+     *  @since 0.9.30
+     */
+    public void reset() throws IOException;
 
     /**
      * Deprecated, unimplemented, does nothing. Original description:
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java
index ab183a817..e8638d4a3 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java
@@ -38,6 +38,10 @@ public interface I2PSocketManager {
     public I2PSession getSession();
     
     /**
+     *  For a server, you must call connect() on the returned object.
+     *  Connecting the primary session does NOT connect any subsessions.
+     *  If the primary session is not connected, connecting a subsession will connect the primary session first.
+     *
      *  @return a new subsession, non-null
      *  @param privateKeyStream null for transient, if non-null must have same encryption keys as primary session
      *                          and different signing keys
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index 56c399b98..d5385d871 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -70,11 +70,15 @@
                 <pathelement location="../../jetty/jettylib/jetty-util.jar" />
                 <pathelement location="../../jetty/jettylib/jetty-webapp.jar" />
                 <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
+                <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
                 <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
                 <pathelement location="../../systray/java/build/systray.jar" />
                 <pathelement location="../../desktopgui/dist/desktopgui.jar" />
                 <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
                 <pathelement location="../../jrobin/java/build/jrobin.jar" />
+
+                <!-- following jars only present for debian builds -->
+                <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
             </classpath>
         </javac>
     </target>
@@ -362,17 +366,22 @@
            **         -trimSpaces        Trim spaces in template text between actions, directives
         -->
         <java classname="org.apache.jasper.JspC" fork="true" failonerror="true">
+            <!-- this prevents tomcat from complaining in debian builds -->
+            <jvmarg value="-Dtomcat.util.scan.StandardJarScanFilter.jarsToSkip=commons-collections.jar,junit.jar,junit4.jar" />
             <classpath>
                 <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
                 <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
-                <!-- jsp-api.jar only present for debian builds -->
+
+                <!-- following jars only present for debian builds -->
                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
-                <!-- tomcat-api.jar only present for debian builds -->
                 <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
-                <!-- jasper-el.jar only present for debian builds -->
                 <pathelement location="../../jetty/jettylib/jasper-el.jar" />
+                <pathelement location="../../jetty/jettylib/tomcat-util.jar" />
+                <pathelement location="../../jetty/jettylib/tomcat-util-scan.jar" />
+
                 <pathelement location="../../jetty/jettylib/commons-logging.jar" />
                 <pathelement location="../../jetty/jettylib/commons-el.jar" />
+                <pathelement location="../../jetty/jettylib/jetty-util.jar" />
                 <pathelement location="${ant.home}/lib/ant.jar" />
                 <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
                 <pathelement location="../../systray/java/build/obj" />
@@ -403,10 +412,13 @@
             <classpath>
                 <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
                 <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
-                <!-- jsp-api.jar only present for debian builds -->
+
+                <!-- following jars only present for debian builds -->
                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
-                <!-- tomcat-api.jar only present for debian builds -->
                 <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
+                <pathelement location="../../jetty/jettylib/tomcat-util.jar" />
+                <pathelement location="../../jetty/jettylib/tomcat-util-scan.jar" />
+
                 <pathelement location="../../jetty/jettylib/commons-logging.jar" />
                 <pathelement location="../../jetty/jettylib/commons-el.jar" />
                 <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
diff --git a/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java b/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
index 44847b1b9..bd5525df2 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
@@ -457,6 +457,13 @@ class PluginUpdateRunner extends UpdateRunner {
                     statusDone("<b>" + _t("Plugin requires Jetty version {0} or higher", minVersion) + "</b>");
                     return;
                 }
+                String blacklistVersion = PluginStarter.jetty9Blacklist.get(appName);
+                if (blacklistVersion != null &&
+                    VersionComparator.comp(version, blacklistVersion) <= 0) {
+                    to.delete();
+                    statusDone("<b>" + _t("Plugin requires Jetty version {0} or lower", "8.9999") + "</b>");
+                    return;
+                }
                 maxVersion = ConfigClientsHelper.stripHTML(props, "max-jetty-version");
                 if (maxVersion != null &&
                     VersionComparator.comp(maxVersion, oldVersion) < 0) {
@@ -480,7 +487,7 @@ class PluginUpdateRunner extends UpdateRunner {
                     }
                     // we don't need the original file anymore.
                     to.delete();
-                    statusDone("<b>" + _t("Plugin will be installed on next restart.") + "</b>");
+                    statusDone("<b>" + _t("Plugin will be installed on next restart.") + ' ' + appName + ' ' + version + "</b>");
                     return;
                 }
                 if (PluginStarter.isPluginRunning(appName, _context)) {
@@ -498,7 +505,7 @@ class PluginUpdateRunner extends UpdateRunner {
             } else {
                 if (Boolean.valueOf(props.getProperty("update-only")).booleanValue()) {
                     to.delete();
-                    statusDone("<b>" + _t("Plugin is for upgrades only, but the plugin is not installed") + "</b>");
+                    statusDone("<b>" + _t("Plugin is for upgrades only, but the plugin is not installed") + ". " + appName + ' ' + version + "</b>");
                     return;
                 }
                 if (!destDir.mkdir()) {
@@ -518,7 +525,7 @@ class PluginUpdateRunner extends UpdateRunner {
             to.delete();
             // install != update. Changing the user's settings like this is probabbly a bad idea.
             if (Boolean.valueOf( props.getProperty("dont-start-at-install")).booleanValue()) {
-                statusDone("<b>" + _t("Plugin {0} installed", appName) + "</b>");
+                statusDone("<b>" + _t("Plugin {0} installed", appName + ' ' + version) + "</b>");
                 if(!update) {
                     Properties pluginProps = PluginStarter.pluginProperties();
                     pluginProps.setProperty(PluginStarter.PREFIX + appName + PluginStarter.ENABLED, "false");
@@ -534,19 +541,19 @@ class PluginUpdateRunner extends UpdateRunner {
                         String linkURL = ConfigClientsHelper.stripHTML(props, "consoleLinkURL");
                         String link;
                         if (linkName != null && linkURL != null)
-                            link = "<a target=\"_blank\" href=\"" + linkURL + "\"/>" + linkName + "</a>";
+                            link = "<a target=\"_blank\" href=\"" + linkURL + "\"/>" + linkName + ' ' + version + "</a>";
                         else
-                            link = appName;
+                            link = appName + ' ' + version;
                         statusDone("<b>" + _t("Plugin {0} installed and started", link) + "</b>");
                     }
                     else
-                        statusDone("<b>" + _t("Plugin {0} installed but failed to start, check logs", appName) + "</b>");
+                        statusDone("<b>" + _t("Plugin {0} installed but failed to start, check logs", appName + ' ' + version) + "</b>");
                 } catch (Throwable e) {
-                    statusDone("<b>" + _t("Plugin {0} installed but failed to start", appName) + ": " + e + "</b>");
-                    _log.error("Error starting plugin " + appName, e);
+                    statusDone("<b>" + _t("Plugin {0} installed but failed to start", appName + ' ' + version) + ": " + e + "</b>");
+                    _log.error("Error starting plugin " + appName + ' ' + version, e);
                 }
             } else {
-                statusDone("<b>" + _t("Plugin {0} installed", appName) + "</b>");
+                statusDone("<b>" + _t("Plugin {0} installed", appName + ' ' + version) + "</b>");
             }
         }
 
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/CodedIconRendererServlet.java b/apps/routerconsole/java/src/net/i2p/router/web/CodedIconRendererServlet.java
index c2be82a9d..f85c3d488 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/CodedIconRendererServlet.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/CodedIconRendererServlet.java
@@ -33,7 +33,7 @@ public class CodedIconRendererServlet extends HttpServlet {
 
 
      @Override
-     protected void service(HttpServletRequest srq, HttpServletResponse srs) throws ServletException, IOException {
+     protected void doGet(HttpServletRequest srq, HttpServletResponse srs) throws ServletException, IOException {
          byte[] data;
          String name = srq.getParameter("plugin");
          data  = NavHelper.getBinary(name);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
index 4cdf13e35..a40c64531 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
@@ -573,7 +573,18 @@ public class ConfigClientsHandler extends FormHandler {
     private void startPlugin(String app) {
         try {
             PluginStarter.startPlugin(_context, app);
-            addFormNotice(_t("Started plugin {0}", app));
+            // linkify the app name for the message if available
+            Properties props = PluginStarter.pluginProperties(_context, app);
+            String name = ConfigClientsHelper.stripHTML(props, "consoleLinkName_" + Messages.getLanguage(_context));
+            if (name == null)
+                name = ConfigClientsHelper.stripHTML(props, "consoleLinkName");
+            String url = ConfigClientsHelper.stripHTML(props, "consoleLinkURL");
+            if (name != null && url != null && name.length() > 0 && url.length() > 0) {
+                app = "<a href=\"" + url + "\">" + name + "</a>";
+                addFormNoticeNoEscape(_t("Started plugin {0}", app));
+            } else {
+                addFormNotice(_t("Started plugin {0}", app));
+            }
         } catch (Throwable e) {
             addFormError(_t("Error starting plugin {0}", app) + ": " + e);
             _log.error("Error starting plugin " + app,  e);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java
index 9c9c7e9dd..c33f0e926 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java
@@ -67,6 +67,22 @@ public class PluginStarter implements Runnable {
     private static Map<String, ClassLoader> _clCache = new ConcurrentHashMap<String, ClassLoader>();
     private static Map<String, Collection<String>> pluginWars = new ConcurrentHashMap<String, Collection<String>>();
 
+    /**
+     *  Plugin name to plugin version of plugins that do not work
+     *  with Jetty 9, but do not have a max-jetty-version=8.9999 set.
+     *  Unmodifiable.
+     *
+     *  @since 0.9.30
+     */
+    public static final Map<String, String> jetty9Blacklist;
+
+    static {
+        Map<String, String> map = new HashMap<String, String>(4);
+        map.put("i2pbote", "0.4.5");
+        map.put("BwSchedule", "0.0.36");
+        jetty9Blacklist = Collections.unmodifiableMap(map);
+    }
+
     public PluginStarter(RouterContext ctx) {
         _context = ctx;
     }
@@ -297,8 +313,8 @@ public class PluginStarter implements Runnable {
 
         Properties props = pluginProperties(ctx, appName);
 
-
-
+        // For the following, we use the exact same translated strings as in PluginUpdateRunner
+        // to avoid duplication
 
         String minVersion = ConfigClientsHelper.stripHTML(props, "min-i2p-version");
         if (minVersion != null &&
@@ -306,6 +322,7 @@ public class PluginStarter implements Runnable {
             String foo = "Plugin " + appName + " requires I2P version " + minVersion + " or higher";
             log.error(foo);
             disablePlugin(appName);
+            foo = gettext("This plugin requires I2P version {0} or higher", minVersion, ctx);
             throw new Exception(foo);
         }
 
@@ -315,6 +332,7 @@ public class PluginStarter implements Runnable {
             String foo = "Plugin " + appName + " requires Java version " + minVersion + " or higher";
             log.error(foo);
             disablePlugin(appName);
+            foo = gettext("This plugin requires Java version {0} or higher", minVersion, ctx);
             throw new Exception(foo);
         }
 
@@ -325,6 +343,18 @@ public class PluginStarter implements Runnable {
             String foo = "Plugin " + appName + " requires Jetty version " + minVersion + " or higher";
             log.error(foo);
             disablePlugin(appName);
+            foo = gettext("Plugin requires Jetty version {0} or higher", minVersion, ctx);
+            throw new Exception(foo);
+        }
+
+        String blacklistVersion = jetty9Blacklist.get(appName);
+        String curVersion = ConfigClientsHelper.stripHTML(props, "version");
+        if (blacklistVersion != null &&
+            VersionComparator.comp(curVersion, blacklistVersion) <= 0) {
+            String foo = "Plugin " + appName + " requires Jetty version 8.9999 or lower";
+            log.error(foo);
+            disablePlugin(appName);
+            foo = gettext("Plugin requires Jetty version {0} or lower", "8.9999", ctx);
             throw new Exception(foo);
         }
 
@@ -334,6 +364,7 @@ public class PluginStarter implements Runnable {
             String foo = "Plugin " + appName + " requires Jetty version " + maxVersion + " or lower";
             log.error(foo);
             disablePlugin(appName);
+            foo = gettext("Plugin requires Jetty version {0} or lower", maxVersion, ctx);
             throw new Exception(foo);
         }
 
@@ -1002,6 +1033,14 @@ public class PluginStarter implements Runnable {
         method.invoke(urlClassLoader, new Object[]{u});
     }
 
+    /**
+     * translate a string
+     * @since 0.9.30
+     */
+    private static String gettext(String s, Object o, I2PAppContext ctx) {
+        return Messages.getString(s, o, ctx);
+    }
+
     /** translate a string */
     private static String ngettext(String s, String p, int n, I2PAppContext ctx) {
         return Messages.getString(n, s, p, ctx);
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 888ccb131..5aefb1588 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
@@ -17,9 +17,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 import java.util.SortedSet;
 import java.util.StringTokenizer;
-import java.util.Timer;
 import java.util.concurrent.LinkedBlockingQueue;
 
 import net.i2p.I2PAppContext;
@@ -46,19 +46,21 @@ import org.eclipse.jetty.security.ConstraintMapping;
 import org.eclipse.jetty.security.ConstraintSecurityHandler;
 import org.eclipse.jetty.security.authentication.DigestAuthenticator;
 import org.eclipse.jetty.server.AbstractConnector;
+import org.eclipse.jetty.server.ConnectionFactory;
 import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.NCSARequestLog;
+import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.UserIdentity;
-import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.server.handler.DefaultHandler;
 import org.eclipse.jetty.server.handler.HandlerCollection;
 import org.eclipse.jetty.server.handler.HandlerWrapper;
 import org.eclipse.jetty.server.handler.RequestLogHandler;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
-import org.eclipse.jetty.server.ssl.SslSocketConnector;
-import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
 import org.eclipse.jetty.servlet.ServletHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.webapp.WebAppContext;
@@ -70,6 +72,7 @@ import org.eclipse.jetty.util.security.Credential.MD5;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.ExecutorThreadPool;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
+import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler;
 import org.eclipse.jetty.util.thread.ThreadPool;
 
 import org.tanukisoftware.wrapper.WrapperManager;
@@ -96,7 +99,7 @@ public class RouterConsoleRunner implements RouterApp {
     private final ClientAppManager _mgr;
     private volatile ClientAppState _state = UNINITIALIZED;
     private static Server _server;
-    private static Timer _jettyTimer;
+    private static ScheduledExecutorScheduler _jettyTimer;
     private String _listenPort;
     private String _listenHost;
     private String _sslListenPort;
@@ -231,6 +234,7 @@ public class RouterConsoleRunner implements RouterApp {
         changeState(STOPPING);
         if (PluginStarter.pluginsEnabled(_context))
             (new I2PAppThread(new PluginStopper(_context), "PluginStopper")).start();
+        stopAllWebApps();
         try {
             _server.stop();
         } catch (Exception ie) {}
@@ -239,7 +243,9 @@ public class RouterConsoleRunner implements RouterApp {
         portMapper.unregister(PortMapper.SVC_HTTPS_CONSOLE);
         synchronized(RouterConsoleRunner.class) {
             if (_jettyTimer != null) {
-                _jettyTimer.cancel();
+                try {
+                    _jettyTimer.stop();
+                } catch (Exception e) {}
                 _jettyTimer = null;
             }
         }
@@ -363,6 +369,22 @@ public class RouterConsoleRunner implements RouterApp {
      *			DefaultHandler
      *			RequestLogHandler (opt)
      *</pre>
+     *
+     *  Porting to Jetty 9:
+     *
+     *  http://dev.eclipse.org/mhonarc/lists/jetty-dev/msg01952.html
+     *  You are missing a few facts about Jetty 9.1 ...
+     *  First, there are no longer any blocking connectors.
+     *  Its all async / nio connectors now. (mainly because that's the direction that the servlet api 3.1 is taking)
+     *
+     *  Next, there is only 1 connector.   The ServerConnector.
+     *  However, it takes 1 or more ConnectionFactory implementations to know how to handle the incoming connection.
+     *  We have factories for HTTP (0.9 thru 1.1), SPDY, SSL-http, and SSL-npn so far.
+     *  This list of factories will expand as the future of connectivity to web servers is ever growing (think HTTP/2)
+     *
+     *  Use the embedded examples for help understanding this.
+     *  http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java?id=jetty-9.1.0.RC0
+     *
      */
     public void startConsole() {
         File workDir = new SecureDirectory(_context.getTempDir(), "jetty-work");
@@ -375,8 +397,9 @@ public class RouterConsoleRunner implements RouterApp {
 
         // so Jetty can find WebAppConfiguration
         System.setProperty("jetty.class.path", _context.getBaseDir() + "/lib/routerconsole.jar");
-        _server = new Server();
-        _server.setGracefulShutdown(1000);
+        // FIXME
+        // http://dev.eclipse.org/mhonarc/lists/jetty-users/msg03487.html
+        //_server.setGracefulShutdown(1000);
 
         // In Jetty 6, QTP was not concurrent, so we switched to
         // ThreadPoolExecutor with a fixed-size queue, a set maxThreads,
@@ -408,14 +431,11 @@ public class RouterConsoleRunner implements RouterApp {
             // class not found...
             //System.out.println("INFO: Jetty concurrent ThreadPool unavailable, using QueuedThreadPool");
             LinkedBlockingQueue<Runnable> lbq = new LinkedBlockingQueue<Runnable>(4*MAX_THREADS);
-            QueuedThreadPool qtp = new QueuedThreadPool(lbq);
-            // min and max threads will be set below
-            //qtp.setMinThreads(MIN_THREADS);
-            //qtp.setMaxThreads(MAX_THREADS);
-            qtp.setMaxIdleTimeMs(MAX_IDLE_TIME);
+            // min and max threads will be reset below
+            QueuedThreadPool qtp = new QueuedThreadPool(MAX_THREADS, MIN_THREADS, MAX_IDLE_TIME, lbq);
             qtp.setName(THREAD_NAME);
             qtp.setDaemon(true);
-            _server.setThreadPool(qtp);
+            _server = new Server(qtp);
         //}
 
         HandlerCollection hColl = new HandlerCollection();
@@ -502,27 +522,15 @@ public class RouterConsoleRunner implements RouterApp {
                         } finally {
                             if (testSock != null) try { testSock.close(); } catch (IOException ioe) {}
                         }
-                        //if (host.indexOf(":") >= 0) // IPV6 - requires patched Jetty 5
-                        //    _server.addListener('[' + host + "]:" + _listenPort);
-                        //else
-                        //    _server.addListener(host + ':' + _listenPort);
-                        AbstractConnector lsnr;
-                        if (SystemVersion.isJava6() && !SystemVersion.isGNU()) {
-                            SelectChannelConnector slsnr = new SelectChannelConnector();
-                            slsnr.setUseDirectBuffers(false);  // default true seems to be leaky
-                            lsnr = slsnr;
-                        } else {
-                            // Jetty 6 and NIO on Java 5 don't get along that well
-                            // Also: http://jira.codehaus.org/browse/JETTY-1238
-                            // "Do not use GCJ with Jetty, it will not work."
-                            // Actually it does if you don't use NIO
-                            lsnr = new SocketConnector();
-                        }
+                        HttpConfiguration httpConfig = new HttpConfiguration();
+                        // number of acceptors, (default) number of selectors
+                        ServerConnector lsnr = new ServerConnector(_server, 1, 0,
+                                                                   new HttpConnectionFactory(httpConfig));
+                        //lsnr.setUseDirectBuffers(false);  // default true seems to be leaky
                         lsnr.setHost(host);
                         lsnr.setPort(lport);
-                        lsnr.setMaxIdleTime(90*1000);  // default 10 sec
+                        lsnr.setIdleTimeout(90*1000);  // default 10 sec
                         lsnr.setName("ConsoleSocket");   // all with same name will use the same thread pool
-                        lsnr.setAcceptors(1);          // default changed to 2 somewhere in Jetty 7?
                         //_server.addConnector(lsnr);
                         connectors.add(lsnr);
                         boundAddresses++;
@@ -586,22 +594,19 @@ public class RouterConsoleRunner implements RouterApp {
                             } finally {
                                 if (testSock != null) try { testSock.close(); } catch (IOException ioe) {}
                             }
-                            // TODO if class not found use SslChannelConnector
-                            AbstractConnector ssll;
-                            if (SystemVersion.isJava6() && !SystemVersion.isGNU()) {
-                                SslSelectChannelConnector sssll = new SslSelectChannelConnector(sslFactory);
-                                sssll.setUseDirectBuffers(false);  // default true seems to be leaky
-                                ssll = sssll;
-                            } else {
-                                // Jetty 6 and NIO on Java 5 don't get along that well
-                                SslSocketConnector sssll = new SslSocketConnector(sslFactory);
-                                ssll = sssll;
-                            }
+                            HttpConfiguration httpConfig = new HttpConfiguration();
+                            httpConfig.setSecureScheme("https");
+                            httpConfig.setSecurePort(sslPort);
+                            httpConfig.addCustomizer(new SecureRequestCustomizer());
+                            // number of acceptors, (default) number of selectors
+                            ServerConnector ssll = new ServerConnector(_server, 1, 0,
+                                                                       new SslConnectionFactory(sslFactory, "http/1.1"),
+                                                                       new HttpConnectionFactory(httpConfig));
+                            //sssll.setUseDirectBuffers(false);  // default true seems to be leaky
                             ssll.setHost(host);
                             ssll.setPort(sslPort);
-                            ssll.setMaxIdleTime(90*1000);  // default 10 sec
+                            ssll.setIdleTimeout(90*1000);  // default 10 sec
                             ssll.setName("ConsoleSocket");   // all with same name will use the same thread pool
-                            ssll.setAcceptors(1);          // default changed to 2 somewhere in Jetty 7?
                             //_server.addConnector(ssll);
                             connectors.add(ssll);
                             boundAddresses++;
@@ -638,17 +643,25 @@ public class RouterConsoleRunner implements RouterApp {
             File tmpdir = new SecureDirectory(workDir, ROUTERCONSOLE + "-" +
                                                        (_listenPort != null ? _listenPort : _sslListenPort));
             tmpdir.mkdir();
-            if (!SystemVersion.isWindows() && !SystemVersion.isMac() &&
-                _context.getBaseDir().getAbsolutePath().equals("/usr/share/i2p")) {
-               // We are using Tomcat 6, so the Debian patch doesn't apply.
-               // Remove when we switch to Tomcat 8
-               _context.logManager().getLog(Server.class).logAlways(net.i2p.util.Log.INFO, "Please ignore any InstanceManager warnings");
-            }
             rootServletHandler = new ServletHandler();
             rootWebApp = new LocaleWebAppHandler(_context,
                                                   "/", _webAppsDir + ROUTERCONSOLE + ".war",
                                                  tmpdir, rootServletHandler);
-            initialize(_context, (WebAppContext)(rootWebApp.getHandler()));
+            try {
+                // Not sure who is supposed to call this, but unless we do,
+                // all the jsps die NPE, because JspFactory.getDefaultContext() returns null.
+                // We probably have to do this because we don't bundle the Jetty annotations jar and scanner.
+                // This is only with Tomcat 8, not with the Jetty (Eclipse) jsp impl.
+                // Got a clue from this ancient post for Tomcat 6:
+                // https://bz.apache.org/bugzilla/show_bug.cgi?id=39804
+                // see also apps/jetty/build.xml
+                Class.forName("org.eclipse.jetty.apache.jsp.JettyJasperInitializer");
+            } catch (ClassNotFoundException cnfe) {
+                System.err.println("Warning: JettyJasperInitializer not found");
+            }
+            WebAppContext wac = (WebAppContext)(rootWebApp.getHandler());
+            initialize(_context, wac);
+            WebAppStarter.setWebAppConfiguration(wac);
             chColl.addHandler(rootWebApp);
 
         } catch (Exception ioe) {
@@ -709,7 +722,13 @@ public class RouterConsoleRunner implements RouterApp {
                 for (int i = 0; i < fileNames.length; i++) {
                     String appName = fileNames[i].substring(0, fileNames[i].lastIndexOf(".war"));
                     String enabled = props.getProperty(PREFIX + appName + ENABLED);
-                    if (! "false".equals(enabled)) {
+                    if (appName.equals("addressbook")) {
+                        // addressbook.war is now empty, thread is started by SusiDNS
+                        if (enabled != null) {
+                            props.remove(PREFIX + "addressbook" + ENABLED);
+                            rewrite = true;
+                        }
+                    } else if (! "false".equals(enabled)) {
                         try {
                             String path = new File(dir, fileNames[i]).getCanonicalPath();
                             WebAppStarter.startWebApp(_context, chColl, appName, path);
@@ -945,7 +964,12 @@ public class RouterConsoleRunner implements RouterApp {
         // see HashSessionManager javadoc
         synchronized(RouterConsoleRunner.class) {
             if (_jettyTimer == null) {
-                _jettyTimer = new Timer("Console HashSessionScavenger", true);
+                _jettyTimer = new ScheduledExecutorScheduler("Console HashSessionScavenger", true);
+                try {
+                    _jettyTimer.start();
+                } catch (Exception e) {
+                    System.err.println("Warning: ScheduledExecutorScheduler start failed: " + e);
+                }
             }
             context.getServletContext().setAttribute("org.eclipse.jetty.server.session.timer", _jettyTimer);
         }
@@ -1018,6 +1042,32 @@ public class RouterConsoleRunner implements RouterApp {
         }
     }
 
+    /**
+     *  Stops all but the root webapp (routerconsole.war)
+     *  In Jetty 9, stopping the server doesn't stop the non-root webapps,
+     *  so we must do it here.
+     *  There should be a better way to do this, possibly by
+     *  making the webapps "managed".
+     *  @since 0.9.30
+     */
+    private void stopAllWebApps() {
+        Properties props = webAppProperties(_context);
+        Set<String> keys = props.stringPropertyNames();
+        for (String name : keys) {
+            if (name.startsWith(PREFIX) && name.endsWith(ENABLED)) {
+                String app = name.substring(PREFIX.length(), name.lastIndexOf(ENABLED));
+                if (ROUTERCONSOLE.equals(app))
+                    continue;
+                if (WebAppStarter.isWebAppRunning(app)) {
+                    try {
+                        WebAppStarter.stopWebApp(app);
+                    } catch (Throwable t) { t.printStackTrace(); }
+                }
+            }
+        }
+
+    }
+
     static class WarFilenameFilter implements FilenameFilter {
         private static final WarFilenameFilter _filter = new WarFilenameFilter();
         public static WarFilenameFilter instance() { return _filter; }
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 3e2eb9ecc..f79533d5e 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;
@@ -97,7 +98,11 @@ public class WebAppConfiguration implements Configuration {
             // Ticket #957... don't know why...
             // Only really required if started manually, but we don't know that from here
             cp = "jetty-util.jar";
-        } else ****/ if (pluginDir.exists()) {
+****/
+        if (ctxPath.equals("/susidns")) {
+            // Old installs don't have this in their wrapper.config classpath
+            cp = "addressbook.jar";
+        } else if (pluginDir.exists()) {
             File consoleDir = new File(pluginDir, "console");
             Properties props = RouterConsoleRunner.webAppProperties(consoleDir.getAbsolutePath());
             cp = props.getProperty(RouterConsoleRunner.PREFIX + appName + CLASSPATH);
@@ -173,11 +178,13 @@ public class WebAppConfiguration implements Configuration {
             }
         } else {
             // Java 9 - assume everything in lib/ is in the classpath
+            // except addressbook.jar
             File libDir = new File(ctx.getBaseDir(), "lib");
             File[] files = libDir.listFiles();
             if (files != null) {
                 for (int i = 0; i < files.length; i++) {
-                    if (files[i].getName().endsWith(".jar"))
+                    String name = files[i].getName();
+                    if (name.endsWith(".jar") && !name.equals("addressbook.jar"))
                         rv.add(files[i].toURI());
                 }
             }
@@ -191,6 +198,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 70a86a89b..884a88cbc 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
@@ -109,17 +109,30 @@ 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
+        // defaults aren't set yet when we call the above. So we have to get the defaults.
+        // Without the default configuration, the web.xml isn't read, and the webapp
+        // won't respond to any requests, even though it appears to be running.
+        // See WebAppContext.loadConfigurations() in source
+        if (classNames.length == 0)
+            classNames = wac.getDefaultConfigurationClasses();
         String[] newClassNames = new String[classNames.length + 1];
         for (int j = 0; j < classNames.length; j++)
              newClassNames[j] = classNames[j];
         newClassNames[classNames.length] = WebAppConfiguration.class.getName();
         wac.setConfigurationClasses(newClassNames);
-        server.addHandler(wac);
-        server.mapContexts();
-        return wac;
     }
 
     /**
diff --git a/apps/routerconsole/jsp/viewstat.jsp b/apps/routerconsole/jsp/viewstat.jsp
index ce44c5cb7..2d17dedc7 100644
--- a/apps/routerconsole/jsp/viewstat.jsp
+++ b/apps/routerconsole/jsp/viewstat.jsp
@@ -61,13 +61,13 @@ if ( !rendered && ((rs != null) || fakeBw) ) {
         if (str != null) try { periodCount = Integer.parseInt(str); } catch (NumberFormatException nfe) {}
         str = request.getParameter("end");
         if (str != null) try { end = Integer.parseInt(str); } catch (NumberFormatException nfe) {}
-        boolean hideLegend = Boolean.parseBoolean((String) request.getParameter("hideLegend"));
-        boolean hideGrid = Boolean.parseBoolean((String) request.getParameter("hideGrid"));
-        boolean hideTitle = Boolean.parseBoolean((String) request.getParameter("hideTitle"));
-        boolean showEvents = Boolean.parseBoolean((String) request.getParameter("showEvents"));
+        boolean hideLegend = Boolean.parseBoolean(request.getParameter("hideLegend"));
+        boolean hideGrid = Boolean.parseBoolean(request.getParameter("hideGrid"));
+        boolean hideTitle = Boolean.parseBoolean(request.getParameter("hideTitle"));
+        boolean showEvents = Boolean.parseBoolean(request.getParameter("showEvents"));
         boolean showCredit = false;
         if (request.getParameter("showCredit") != null)
-          showCredit = Boolean.parseBoolean((String) request.getParameter("showCredit"));
+          showCredit = Boolean.parseBoolean(request.getParameter("showCredit"));
         if (fakeBw)
             rendered = net.i2p.router.web.StatSummarizer.instance().renderRatePng(cout, width, height, hideLegend, hideGrid, hideTitle, showEvents, periodCount, end, showCredit);
         else
diff --git a/apps/sam/java/src/net/i2p/sam/MasterSession.java b/apps/sam/java/src/net/i2p/sam/MasterSession.java
index fc69a7238..19d102951 100644
--- a/apps/sam/java/src/net/i2p/sam/MasterSession.java
+++ b/apps/sam/java/src/net/i2p/sam/MasterSession.java
@@ -389,7 +389,7 @@ class MasterSession extends SAMv3StreamSession implements SAMDatagramReceiver, S
 					boolean ok = ssess.queueSocket(i2ps);
 					if (!ok) {
 						_log.logAlways(Log.WARN, "Accept queue overflow for " + ssess);
-						try { i2ps.close(); } catch (IOException ioe) {}
+						try { i2ps.reset(); } catch (IOException ioe) {}
 					}
 				} else {
 					if (_log.shouldLog(Log.WARN))
diff --git a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
index 8cc9b5662..3d6708e05 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
@@ -564,7 +564,7 @@ class SAMStreamSession implements SAMMessageSess {
                     int id = createSocketHandler(i2ps, 0);
                     if (id == 0) {
                         _log.error("SAM STREAM session handler not created!");
-                        i2ps.close();
+                        i2ps.reset();
                         continue;
                     }
 
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java
index 8be28b475..40f3b95df 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java
@@ -383,7 +383,7 @@ class SAMv3StreamSession  extends SAMStreamSession implements Session
 									Log log = ctx.logManager().getLog(SAMv3StreamSession.class);
 									log.error("SSL error", gse);
 									try {
-										i2ps.close();
+										i2ps.reset();
 									} catch (IOException ee) {}
 									throw new RuntimeException("SSL error", gse);
 								}
@@ -401,7 +401,7 @@ class SAMv3StreamSession  extends SAMStreamSession implements Session
 					if (log.shouldLog(Log.WARN))
 						log.warn("Error forwarding", ioe);
 					try {
-						i2ps.close();
+						i2ps.reset();
 					} catch (IOException ee) {}
 					continue;
 	    			}
@@ -433,7 +433,7 @@ class SAMv3StreamSession  extends SAMStreamSession implements Session
 	    					clientServerSock.close();
 	    				} catch (IOException ee) {}
 	    				try {
-	    					i2ps.close();
+	    					i2ps.reset();
 	    				} catch (IOException ee) {}
 	    				continue ;
 	    			}
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketFull.java
index 6800e8a6e..f86a1979d 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketFull.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketFull.java
@@ -67,6 +67,32 @@ class I2PSocketFull implements I2PSocket {
         destroy();
     }
     
+    /**
+     *  Resets and closes this socket. Sends a RESET indication to the far-end.
+     *  This is the equivalent of setSoLinger(true, 0) followed by close() on a Java Socket.
+     *
+     *  Nonblocking.
+     *  Any thread currently blocked in an I/O operation upon this socket will throw an IOException.
+     *  Once a socket has been reset, it is not available for further networking use
+     *  (i.e. can't be reconnected or rebound). A new socket needs to be created.
+     *  Resetting this socket will also close the socket's InputStream and OutputStream.
+     *
+     *  @since 0.9.30
+     */
+    public void reset() throws IOException {
+        Connection c = _connection;
+        if (c == null) return;
+        if (log.shouldLog(Log.INFO))
+            log.info("reset() called, connected? " + c.getIsConnected() + " : " + c, new Exception());
+        if (c.getIsConnected()) {
+            c.disconnect(false);
+            // this will cause any thread waiting in Connection.packetSendChoke()
+            // to throw an IOE
+            c.windowAdjusted();
+        }
+        destroy();
+    }
+    
     Connection getConnection() { return _connection; }
     
     /**
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
index 94a4c4ae6..ee4c4ecc7 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
@@ -236,6 +236,10 @@ public class I2PSocketManagerFull implements I2PSocketManager {
     }
     
     /**
+     *  For a server, you must call connect() on the returned object.
+     *  Connecting the primary session does NOT connect any subsessions.
+     *  If the primary session is not connected, connecting a subsession will connect the primary session first.
+     *
      *  @return a new subsession, non-null
      *  @param privateKeyStream null for transient, if non-null must have same encryption keys as primary session
      *                          and different signing keys
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageOutputStream.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageOutputStream.java
index 72b2e0251..b8889c972 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageOutputStream.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageOutputStream.java
@@ -30,7 +30,9 @@ class MessageOutputStream extends OutputStream {
     private final AtomicBoolean _closed = new AtomicBoolean();
     private long _written;
     private int _writeTimeout;
-    private ByteCache _dataCache;
+    private final ByteCache _dataCache;
+    private final int _originalBufferSize;
+    private int _currentBufferSize;
     private final Flusher _flusher;
     private volatile long _lastBuffered;
     /** if we enqueue data but don't flush it in this period, flush it passively */
@@ -68,6 +70,8 @@ class MessageOutputStream extends OutputStream {
                                DataReceiver receiver, int bufSize, int passiveFlushDelay) {
         super();
         _dataCache = ByteCache.getInstance(128, bufSize);
+        _originalBufferSize = bufSize;
+        _currentBufferSize = bufSize;
         _context = ctx;
         _log = ctx.logManager().getLog(MessageOutputStream.class);
         _buf = _dataCache.acquire().getData(); // new byte[bufSize];
@@ -75,7 +79,7 @@ class MessageOutputStream extends OutputStream {
         _dataLock = new Object();
         _writeTimeout = -1;
         _passiveFlushDelay = passiveFlushDelay;
-        _nextBufferSize = -1;
+        _nextBufferSize = 0;
         //_sendPeriodBeginTime = ctx.clock().now();
         //_context.statManager().createRateStat("stream.sendBps", "How fast we pump data through the stream", "Stream", new long[] { 60*1000, 5*60*1000, 60*60*1000 });
         _flusher = new Flusher(timer);
@@ -92,7 +96,16 @@ class MessageOutputStream extends OutputStream {
 
     public int getWriteTimeout() { return _writeTimeout; }
 
-    public void setBufferSize(int size) { _nextBufferSize = size; }
+    /**
+     *  Caller should enforce a sane minimum.
+     *
+     *  @param size must be greater than 0, and smaller than or equal to bufSize in constructor
+     */
+    public void setBufferSize(int size) {
+        if (size <= 0 || size > _originalBufferSize)
+            return;
+        _nextBufferSize = size;
+    }
     
     @Override
     public void write(byte b[]) throws IOException {
@@ -115,8 +128,11 @@ class MessageOutputStream extends OutputStream {
             // this is the only method that *adds* to the _buf, and all 
             // code that reads from it is synchronized
             synchronized (_dataLock) {
+                // To simplify the code, and avoid losing data from shrinking the max size,
+                // we only update max size when current buffer is empty
+                final int maxBuffer = (_valid == 0) ? locked_updateBufferSize() : _currentBufferSize;
                 if (_buf == null) throw new IOException("closed (buffer went away)");
-                if (_valid + remaining < _buf.length) {
+                if (_valid + remaining < maxBuffer) {
                     // simply buffer the data, no flush
                     System.arraycopy(b, cur, _buf, _valid, remaining);
                     _valid += remaining;
@@ -131,19 +147,17 @@ class MessageOutputStream extends OutputStream {
                     // buffer whatever we can fit then flush,
                     // repeating until we've pushed all of the
                     // data through
-                    int toWrite = _buf.length - _valid;
+                    int toWrite = maxBuffer - _valid;
                     System.arraycopy(b, cur, _buf, _valid, toWrite);
                     remaining -= toWrite;
                     cur += toWrite;
-                    _valid = _buf.length;
+                    _valid = maxBuffer;
                     if (_log.shouldLog(Log.INFO))
                         _log.info("write() direct valid = " + _valid);
                     ws = _dataReceiver.writeData(_buf, 0, _valid);
                     _written += _valid;
                     _valid = 0;                       
                     throwAnyError();
-                    
-                    locked_updateBufferSize();
                 }
             }
             if (ws != null) {
@@ -207,17 +221,21 @@ class MessageOutputStream extends OutputStream {
     /**
      * If the other side requested we shrink our buffer, do so.
      *
+     * @return the current buffer size
      */
-    private final void locked_updateBufferSize() {
+    private final int locked_updateBufferSize() {
         int size = _nextBufferSize;
         if (size > 0) {
             // update the buffer size to the requested amount
-            _dataCache.release(new ByteArray(_buf));
-            _dataCache = ByteCache.getInstance(128, size);
-            ByteArray ba = _dataCache.acquire();
-            _buf = ba.getData();
-            _nextBufferSize = -1;
+            // No, never do this, to avoid ByteCache churn.
+            //_dataCache.release(new ByteArray(_buf));
+            //_dataCache = ByteCache.getInstance(128, size);
+            //ByteArray ba = _dataCache.acquire();
+            //_buf = ba.getData();
+            _currentBufferSize = size;
+            _nextBufferSize = 0;
         }
+        return _currentBufferSize;
     }
     
     /**
@@ -273,7 +291,6 @@ class MessageOutputStream extends OutputStream {
                         ws = _dataReceiver.writeData(_buf, 0, _valid);
                         _written += _valid;
                         _valid = 0;
-                        locked_updateBufferSize();
                         _dataLock.notifyAll();
                         sent = true;
                     }
@@ -336,7 +353,6 @@ class MessageOutputStream extends OutputStream {
                 ws = _dataReceiver.writeData(_buf, 0, _valid);
                 _written += _valid;
                 _valid = 0;
-                locked_updateBufferSize();
                 _dataLock.notifyAll();
             }
         }
@@ -409,7 +425,6 @@ class MessageOutputStream extends OutputStream {
                 ba = new ByteArray(_buf);
                 _buf = null;
                 _valid = 0;
-                locked_updateBufferSize();
             }
             _dataLock.notifyAll();
         }
@@ -494,7 +509,6 @@ class MessageOutputStream extends OutputStream {
             ws = target.writeData(_buf, 0, _valid);
             _written += _valid;
             _valid = 0;
-            locked_updateBufferSize();
             _dataLock.notifyAll();
         }
         long afterBuild = System.currentTimeMillis();
diff --git a/apps/susidns/src/WEB-INF/web-template.xml b/apps/susidns/src/WEB-INF/web-template.xml
index 1937a5b14..a1b019ab7 100644
--- a/apps/susidns/src/WEB-INF/web-template.xml
+++ b/apps/susidns/src/WEB-INF/web-template.xml
@@ -13,6 +13,22 @@
     </filter-mapping>
 
   <display-name>susidns</display-name>
+
+    <servlet>
+        <servlet-name>addressbook-runner</servlet-name>
+        <servlet-class>net.i2p.addressbook.servlet.Servlet</servlet-class>
+        <init-param>
+            <param-name>home</param-name>
+            <param-value>./addressbook</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping> 
+      <servlet-name>addressbook-runner</servlet-name>
+      <url-pattern>/addressbook-runner</url-pattern>
+    </servlet-mapping>
+
     <!-- precompiled servlets -->
 
     <!-- non-.jsp URLs -->
diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml
index ac9a6f63a..60d66140f 100644
--- a/apps/susidns/src/build.xml
+++ b/apps/susidns/src/build.xml
@@ -16,20 +16,22 @@
                   -->
 		<pathelement location="${lib}/commons-el.jar" />
 		<pathelement location="${lib}/javax.servlet.jar"/>
-                <!-- jsp-api.jar only present for debian builds -->
+
+                <!-- following jars only present for debian builds -->
                 <pathelement location="${lib}/jsp-api.jar" />
-                <!-- tomcat-api.jar only present for debian builds -->
                 <pathelement location="${lib}/tomcat-api.jar" />
-                <!-- tomcat-util.jar only present for debian builds -->
                 <pathelement location="${lib}/tomcat-util.jar" />
+                <pathelement location="${lib}/tomcat-util-scan.jar" />
+		<pathelement location="${lib}/jasper-el.jar" />
+
 		<pathelement location="lib/jstl.jar" />
 		<pathelement location="lib/standard.jar" />
 		<pathelement location="${lib}/jasper-runtime.jar" />
 		<pathelement location="${lib}/commons-logging.jar" />
-                <!-- jasper-el.jar only present for debian builds -->
-		<pathelement location="${lib}/jasper-el.jar" />
+		<pathelement location="${lib}/jetty-util.jar" />
 		<pathelement location="${ant.home}/lib/ant.jar" />
 		<pathelement location="../../../core/java/build/i2p.jar" />
+		<pathelement location="../../addressbook/dist/addressbook.jar" />
  	</path>
 
 	<property name="javac.compilerargs" value="" />
diff --git a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java
index 9ea9eed4e..483cc47b6 100644
--- a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java
+++ b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java
@@ -314,6 +314,9 @@ public class AddressbookBean extends BaseBean
 					}
 					if (action.equals(_t("Delete Entry")))
 						search = null;
+				} else if (action.equals(_t("Add Alternate"))) {
+					// button won't be in UI
+					message = "Unsupported";
 				}
 				if( changed ) {
 					try {
diff --git a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java
index e76b4a4dd..99a516581 100644
--- a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java
+++ b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java
@@ -231,7 +231,7 @@ public class NamingServiceBean extends AddressbookBean
                         if (_context.getBooleanProperty(PROP_PW_ENABLE) ||
 			    (serial != null && serial.equals(lastSerial))) {
 				boolean changed = false;
-				if (action.equals(_t("Add")) || action.equals(_t("Replace"))) {
+				if (action.equals(_t("Add")) || action.equals(_t("Replace")) || action.equals(_t("Add Alternate"))) {
 					if(hostname != null && destination != null) {
 						try {
 							// throws IAE with translated message
@@ -243,20 +243,38 @@ public class NamingServiceBean extends AddressbookBean
 							Destination oldDest = getNamingService().lookup(host, nsOptions, outProperties);
 							if (oldDest != null && destination.equals(oldDest.toBase64())) {
 								message = _t("Host name {0} is already in address book, unchanged.", displayHost);
-							} else if (oldDest != null && !action.equals(_t("Replace"))) {
+							} else if (oldDest == null && action.equals(_t("Add Alternate"))) {
+								message = _t("Host name {0} is not in  the address book.", displayHost);
+							} else if (oldDest != null && action.equals(_t("Add"))) {
 								message = _t("Host name {0} is already in address book with a different destination. Click \"Replace\" to overwrite.", displayHost);
 							} else {
 								try {
 									Destination dest = new Destination(destination);
 									if (oldDest != null) {
 										nsOptions.putAll(outProperties);
-							                        nsOptions.setProperty("m", Long.toString(_context.clock().now()));
+							                        String now = Long.toString(_context.clock().now());
+										if (action.equals(_t("Add Alternate")))
+							                        	nsOptions.setProperty("a", now);
+										else
+							                        	nsOptions.setProperty("m", now);
 									}
 						                        nsOptions.setProperty("s", _t("Manually added via SusiDNS"));
-									boolean success = getNamingService().put(host, dest, nsOptions);
+									boolean success;
+							                if (action.equals(_t("Add Alternate"))) {
+										// check all for dups
+										List<Destination> all = getNamingService().lookupAll(host);
+										if (all == null || !all.contains(dest)) {
+											success = getNamingService().addDestination(host, dest, nsOptions);
+										} else {
+											// will get generic message below
+											success = false;
+										}
+									} else {
+										success = getNamingService().put(host, dest, nsOptions);
+									}
 									if (success) {
 										changed = true;
-										if (oldDest == null)
+										if (oldDest == null || action.equals(_t("Add Alternate")))
 											message = _t("Destination added for {0}.", displayHost);
 										else
 											message = _t("Destination changed for {0}.", displayHost);
@@ -285,8 +303,21 @@ public class NamingServiceBean extends AddressbookBean
 				} else if (action.equals(_t("Delete Selected")) || action.equals(_t("Delete Entry"))) {
 					String name = null;
 					int deleted = 0;
+					Destination matchDest = null;
+					if (action.equals(_t("Delete Entry"))) {
+						// remove specified dest only in case there is more than one
+						if (destination != null) {
+							try {
+								matchDest = new Destination(destination);
+							} catch (DataFormatException dfe) {}
+						}
+					}
 					for (String n : deletionMarks) {
-						boolean success = getNamingService().remove(n, nsOptions);
+						boolean success;
+						if (matchDest != null)
+							success = getNamingService().remove(n, matchDest, nsOptions);
+						else
+							success = getNamingService().remove(n, nsOptions);
 						String uni = AddressBean.toUnicode(n);
 						String displayHost = uni.equals(n) ? n :  uni + " (" + n + ')';
 						if (!success) {
diff --git a/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java b/apps/susidns/src/java/src/net/i2p/addressbook/servlet/Servlet.java
similarity index 62%
rename from apps/addressbook/java/src/net/i2p/addressbook/Servlet.java
rename to apps/susidns/src/java/src/net/i2p/addressbook/servlet/Servlet.java
index c72adef0a..108295005 100644
--- a/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java
+++ b/apps/susidns/src/java/src/net/i2p/addressbook/servlet/Servlet.java
@@ -19,11 +19,10 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package net.i2p.addressbook;
+package net.i2p.addressbook.servlet;
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.Random;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -31,25 +30,29 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import net.i2p.I2PAppContext;
+//import net.i2p.addressbook.DaemonThread;
+import net.i2p.util.Log;
+
 /**
  * A wrapper for addressbook to allow it to be started as a web application.
  * 
- * This was a GenericServlet, we make it an HttpServlet solely to provide a hook
- * for SusiDNS to wake us up when the subscription list changes.
+ * This was a GenericServlet, we make it an HttpServlet solely to provide a
+ * simple page to display status.
  * 
+ * @since 0.9.30 moved from addressbook to SusiDNS
  * @author Ragnarok
  *
  */
 public class Servlet extends HttpServlet {
 
     private static final long serialVersionUID = 1L;
-    private transient DaemonThread thread;
+    private transient Thread thread;
     //private String nonce;
     //private static final String PROP_NONCE = "addressbook.nonce";
 
     /**
-     * Hack to allow susidns to kick the daemon when the subscription list changes.
-     * URL must be /addressbook/ with wakeup param set, and nonce param set from system property.
+     * Simple output to verify that the addressbook servlet is running.
      *
      * (non-Javadoc)
      * see javax.servlet.Servlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)
@@ -70,6 +73,7 @@ public class Servlet extends HttpServlet {
     /* (non-Javadoc)
      * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
      */
+    @SuppressWarnings("unchecked")
     @Override
     public void init(ServletConfig config) {
         try {
@@ -82,17 +86,39 @@ public class Servlet extends HttpServlet {
         //System.setProperty(PROP_NONCE, this.nonce);
         String[] args = new String[1];
         args[0] = config.getInitParameter("home");
-        this.thread = new DaemonThread(args);
-        this.thread.setDaemon(true);
-        this.thread.setName("Addressbook");
-        this.thread.start();
-        //System.out.println("INFO: Starting Addressbook " + Daemon.VERSION);
-        //System.out.println("INFO: config root under " + args[0]);
+        try {
+            ClassLoader cl = getServletContext().getClassLoader();
+            Class cls = Class.forName("net.i2p.addressbook.DaemonThread", true, cl);
+            // We do it this way so that if we can't find addressbook,
+            // the whole thing doesn't die.
+            // We do add addressbook.jar in WebAppConfiguration,
+            // so this is just in case.
+            //Thread t = new DaemonThread(args);
+            Thread t = (Thread) cls.getConstructor(String[].class).newInstance((Object)args);
+            t.setDaemon(true);
+            t.setName("Addressbook");
+            t.start();
+            this.thread = t;
+            //System.out.println("INFO: Starting Addressbook " + Daemon.VERSION);
+            //System.out.println("INFO: config root under " + args[0]);
+        } catch (Throwable t) {
+            // addressbook.jar may not be in the classpath
+            I2PAppContext.getGlobalContext().logManager().getLog(Servlet.class).logAlways(Log.WARN, "Addressbook thread not started: " + t);
+        }
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public void destroy() {
-        this.thread.halt();
+        if (this.thread != null) {
+            //((DaemonThread)this.thread).halt();
+            try {
+                ClassLoader cl = getServletContext().getClassLoader();
+                Class<?> cls = Class.forName("net.i2p.addressbook.DaemonThread", true, cl);
+                Object t = cls.cast(this.thread);
+                cls.getDeclaredMethod("halt").invoke(t);
+            } catch (Throwable t) {}
+        }
         super.destroy();
     }
 }
diff --git a/apps/susidns/src/java/src/net/i2p/addressbook/servlet/package.html b/apps/susidns/src/java/src/net/i2p/addressbook/servlet/package.html
new file mode 100644
index 000000000..644aab502
--- /dev/null
+++ b/apps/susidns/src/java/src/net/i2p/addressbook/servlet/package.html
@@ -0,0 +1,8 @@
+<html>
+<body>
+<p>
+The servlet that starts the addressbook DaemonThread.
+Moved from addressbook to SusiDNS in 0.9.30.
+</p>
+</body>
+</html>
diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp
index 0ceed8e81..8e694b25d 100644
--- a/apps/susidns/src/jsp/addressbook.jsp
+++ b/apps/susidns/src/jsp/addressbook.jsp
@@ -136,6 +136,7 @@ ${book.loadBookMessages}
 
 <div id="search">
 <form method="POST" action="addressbook">
+<input type="hidden" name="book" value="${book.book}">
 <input type="hidden" name="begin" value="0">
 <input type="hidden" name="end" value="49">
 <table>
@@ -154,6 +155,7 @@ ${book.loadBookMessages}
 %>
 <c:if test="${book.notEmpty}">
 <form method="POST" action="addressbook">
+<input type="hidden" name="book" value="${book.book}">
 <input type="hidden" name="serial" value="<%=susiNonce%>">
 <input type="hidden" name="begin" value="0">
 <input type="hidden" name="end" value="49">
@@ -181,7 +183,7 @@ ${book.loadBookMessages}
 <td class="names"><a href="/imagegen/id?s=256&amp;c=${addr.b32}" target="_blank" title="<%=intl._t("View larger version of identicon for this hostname")%>"><img src="/imagegen/id?s=20&amp;c=${addr.b32}"></a><a href="http://${addr.name}/" target="_top">${addr.displayName}</a></td>
 <td class="names"><span class="addrhlpr"><a href="http://${addr.b32}/" target="_blank" title="<%=intl._t("Base 32 address")%>">b32</a></span></td>
 <td class="helper"><a href="http://${addr.name}/?i2paddresshelper=${addr.destination}" target="_blank" title="<%=intl._t("Helper link to share host address with option to add to addressbook")%>">link</a></td>
-<td class="names"><span class="addrhlpr"><a href="details?h=${addr.name}" title="<%=intl._t("More information on this entry")%>"><%=intl._t("details")%></a></span></td>
+<td class="names"><span class="addrhlpr"><a href="details?h=${addr.name}&amp;book=${book.book}" title="<%=intl._t("More information on this entry")%>"><%=intl._t("details")%></a></span></td>
 <td class="destinations"><div class="destaddress" name="dest_${addr.name}" width="200px">${addr.destination}</div></td>
 
 <c:if test="${book.validBook}">
@@ -215,6 +217,7 @@ ${book.loadBookMessages}
 </c:if>
 
 <form method="POST" action="addressbook">
+<input type="hidden" name="book" value="${book.book}">
 <input type="hidden" name="serial" value="<%=susiNonce%>">
 <input type="hidden" name="begin" value="0">
 <input type="hidden" name="end" value="49">
@@ -233,6 +236,9 @@ ${book.loadBookMessages}
 <p class="buttons">
 <input class="cancel" type="reset" value="<%=intl._t("Cancel")%>" >
 <input class="accept" type="submit" name="action" value="<%=intl._t("Replace")%>" >
+<% if (!book.getBook().equals("published")) { %>
+  <input class="add" type="submit" name="action" value="<%=intl._t("Add Alternate")%>" >
+<% } %>
 <input class="add" type="submit" name="action" value="<%=intl._t("Add")%>" >
 </p>
 </div>
diff --git a/apps/susidns/src/jsp/details.jsp b/apps/susidns/src/jsp/details.jsp
index 1341feaa5..03c366678 100644
--- a/apps/susidns/src/jsp/details.jsp
+++ b/apps/susidns/src/jsp/details.jsp
@@ -77,6 +77,8 @@
         if (addrs == null) {
             %><p>Not found: <%=detail%></p><%
         } else {
+            // use one nonce for all
+            String nonce = book.getSerial();
             for (i2p.susi.dns.AddressBean addr : addrs) {
                 String b32 = addr.getB32();
 %>
@@ -149,10 +151,12 @@
 <div id="buttons">
 <form method="POST" action="addressbook">
 <p class="buttons">
-<input type="hidden" name="serial" value="${book.serial}">
+<input type="hidden" name="book" value="${book.book}">
+<input type="hidden" name="serial" value="<%=nonce%>">
 <input type="hidden" name="begin" value="0">
 <input type="hidden" name="end" value="49">
 <input type="hidden" name="checked" value="<%=detail%>">
+<input type="hidden" name="destination" value="<%=addr.getDestination()%>">
 <input class="delete" type="submit" name="action" value="<%=intl._t("Delete Entry")%>" >
 </p>
 </form>
diff --git a/build.properties b/build.properties
index 8aa9bb327..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/
@@ -131,12 +131,8 @@ 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 libjetty8-java package
-#with-libjetty8-java=true
-# Don't include tomcat files, we will use libtomcat6-java package
-#with-libtomcat6-java=true
-# Don't include tomcat files, we will use libtomcat7-java package
-#with-libtomcat7-java=true
+# 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
 # Don't include jstl.jar and standard.jar, we will use glassfish-javaee package
diff --git a/build.xml b/build.xml
index 2b5f482c7..45be9efba 100644
--- a/build.xml
+++ b/build.xml
@@ -70,8 +70,8 @@
             <echo message="The following command will install the build dependencies for you:" />
             <echo message=" " />
             <echo message="sudo apt-get install debhelper ant debconf default-jdk gettext libgmp-dev po-debconf fakeroot \" />
-            <echo message="  build-essential quilt libcommons-logging-java dh-apparmor dh-systemd libservice-wrapper-java \"  />
-            <echo message="  devscripts libjetty8-java glassfish-javaee"  />
+            <echo message="  build-essential quilt dh-apparmor dh-systemd libservice-wrapper-java \"  />
+            <echo message="  devscripts libjetty9-java libtomcat8-java glassfish-javaee libgetopt-java"  />
             <echo message=" " />
             <echo message="The following command will install the additional runtime dependencies:" />
             <echo message="sudo apt-get install libecj-java geoip-database" />
@@ -310,7 +310,7 @@
         <copy file="apps/susimail/susimail.war" todir="build/" />
     </target>
 
-    <target name="buildSusiDNS" depends="buildCore, buildJetty, buildImagegen" >
+    <target name="buildSusiDNS" depends="buildCore, buildJetty, buildImagegen, buildAddressbook" >
         <ant dir="apps/susidns/src" target="all" />
         <copy file="apps/susidns/src/susidns.war" todir="build/" />
     </target>
@@ -332,8 +332,10 @@
         <copy file="apps/addressbook/dist/addressbook.jar" todir="build/" />
     </target>
 
-    <target name="buildAddressbook" depends="buildCore, buildJetty" >
-        <ant dir="apps/addressbook/" target="war" />
+    <target name="buildAddressbook" depends="buildCore" >
+        <ant dir="apps/addressbook/" target="all" />
+        <copy file="apps/addressbook/dist/addressbook.jar" todir="build/" />
+        <!-- war is empty, only for updates -->
         <copy file="apps/addressbook/dist/addressbook.war" todir="build/" />
     </target>
 
@@ -734,7 +736,7 @@
             <group title="JRobin Library" packages="org.jrobin:org.jrobin.*:engine.misc" />
             <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" />
+            <group title="SusiDNS Application" packages="i2p.susi.dns:net.i2p.addressbook.servlet" />
             <group title="SusiMail Application" packages="i2p.susi.webmail:i2p.susi.webmail.*:i2p.susi.debug:i2p.susi.util" />
             <group title="Systray Application" packages="net.i2p.apps.systray" />
             <sourcepath>
@@ -764,6 +766,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" />
@@ -1204,7 +1207,7 @@
         <copy file="build/i2psnark.jar" todir="pkg-temp/lib/" />
         <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
         <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />
-        <copy file="build/addressbook.war" todir="pkg-temp/webapps/" />
+        <copy file="build/addressbook.jar" todir="pkg-temp/lib/" />
         <copy file="build/susimail.war" todir="pkg-temp/webapps/" />
         <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
         <copy file="build/imagegen.war" todir="pkg-temp/webapps/" />
@@ -1242,7 +1245,7 @@
         <copy file="build/jetty-i2p.jar" todir="pkg-temp/lib" />
     </target>
 
-    <target name="copyjetty-unlesspkg" unless="${with-libjetty8-java}" >
+    <target name="copyjetty-unlesspkg" unless="${with-libjetty9-java}" >
         <copy todir="pkg-temp/lib" >
             <fileset dir="build" includes="javax.servlet.jar jetty*.jar org.mortbay.*.jar" excludes="jetty-i2p.jar" />
         </copy>
@@ -1289,7 +1292,9 @@
     </target>
 
     <target name="preplicenses-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" >
+<!--  replacement?
         <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
+-->
     </target>
 
     <!-- DOES include launch4j licenses for Windows builds -->
@@ -1462,11 +1467,11 @@
         <!-- *nix here -->
         <exec executable="sh" osfamily="unix" failonerror="true">
             <arg value="-c" />
-            <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />
+            <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/commons-logging.jar -o $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar -o $i = pkg-temp/webapps/addressbook.war ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />
         </exec>
         <exec executable="sh" osfamily="mac" failonerror="true">
             <arg value="-c" />
-            <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />
+            <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/commons-logging.jar -o $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar -o $i = pkg-temp/webapps/addressbook.war ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />
         </exec>
         <!-- windoz here : i admit, i hate escaped symbols in xml, indeed = =! -->
         <exec executable="cmd" osfamily="windows" failonerror="true">
@@ -1548,6 +1553,7 @@
         <copy file="build/jrobin.jar" tofile="pkg-temp/lib/jrobin.jar" />
         <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
         <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />
+        <copy file="build/addressbook.jar" todir="pkg-temp/lib/" />
         <copy file="build/addressbook.war" todir="pkg-temp/webapps/" />
         <!-- decapitalized the file in 0.7.8 -->
         <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
@@ -1595,13 +1601,13 @@
         <!--  We have to package the new eepsite files for MigrateJetty.java, but we
               can't overwrite an existing eepsite dir in a non-split configuration.
           -->
-        <copy todir="pkg-temp/eepsite-jetty7" >
+        <copy todir="pkg-temp/eepsite-jetty9" >
             <fileset dir="installer/resources/eepsite" includes="*.xml contexts/* etc/*" />
         </copy>
     </target>
 
     <target name="delete-j6-update">
-        <delete dir="pkg-temp/eepsite-jetty7" />
+        <delete dir="pkg-temp/eepsite-jetty9" />
     </target>
 
     <!-- Jetty 6 I2P logging addons, not really fixes -->
@@ -1895,7 +1901,6 @@
             <!-- start of the files to be analyzed -->
             <arg value="build/BOB.jar"/>
             <arg value="build/addressbook.jar"/>
-            <arg value="build/addressbook.war"/>
             <arg value="build/i2p.jar"/>
             <arg value="build/i2psnark.jar"/>
             <arg value="build/i2psnark.war"/>
@@ -2204,7 +2209,7 @@
             <arg value="w:" />
             <arg value="../i2p-${Extended.Version}" />
         </exec>
-        <delete includeemptydirs="true" quiet="false">
+        <delete includeemptydirs="true" quiet="false" failonerror="false">
             <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
             <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
             <fileset dir="../i2p-${Extended.Version}/Slackware" />
@@ -2220,19 +2225,14 @@
             <!-- geoip-database -->
             <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
             <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
-            <!-- libjetty8-java -->
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.21.v20160908" />
+            <!-- libjetty9-java -->
+            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" />
             <!-- libjstl1.1-java or glassfish-javaee -->
           <!--
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
            -->
             <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
-            <!-- libtomcat6-java or libtomcat7-java -->
-          <!--
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
-           -->
             <!-- anything added above, add in debian-release-tarball also -->
         </delete>
         <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
@@ -2248,10 +2248,6 @@
                 <exclude name="apps/susidns/src/lib/jstl.jar" />
            -->
                 <exclude name="apps/susidns/src/lib/standard.jar" />
-          <!--
-                <exclude name="apps/jetty/apache-tomcat/**"/>
-                <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
-           -->
                 <!-- anything added above, add in debian-release-tarball also -->
             </tarfileset>
             <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${Extended.Version}" filemode="755">
@@ -2286,7 +2282,7 @@
             <arg value="i2p.i2p" />
             <arg value="../i2p-${Extended.Version}" />
         </exec>
-        <delete includeemptydirs="true" quiet="false">
+        <delete includeemptydirs="true" quiet="false" failonerror="false">
             <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
             <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
             <fileset dir="../i2p-${Extended.Version}/Slackware" />
@@ -2302,9 +2298,9 @@
             <!-- geoip-database -->
             <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
             <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
-            <!-- libjetty8-java -->
+            <!-- libjetty9-java -->
           <!--
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.21.v20160908" />
+            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" />
            -->
             <!-- libjstl1.1-java or glassfish-javaee -->
           <!--
@@ -2312,11 +2308,6 @@
            -->
             <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
-            <!-- libtomcat6-java or libtomcat7-java -->
-          <!--
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
-           -->
             <!-- anything added above, add in debian-release-tarball also -->
         </delete>
         <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
@@ -2334,10 +2325,6 @@
                 <exclude name="apps/susidns/src/lib/jstl.jar" />
            -->
                 <exclude name="apps/susidns/src/lib/standard.jar" />
-          <!--
-                <exclude name="apps/jetty/apache-tomcat/**"/>
-                <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
-           -->
                 <!-- anything added above, add in debian-release-tarball also -->
             </tarfileset>
             <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${Extended.Version}" filemode="755">
@@ -2369,7 +2356,7 @@
             <arg value="i2p.i2p" />
             <arg value="../i2p-${Extended.Version}" />
         </exec>
-        <delete includeemptydirs="true" quiet="false">
+        <delete includeemptydirs="true" quiet="false" failonerror="false">ilonerror="false">
             <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
             <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
             <fileset dir="../i2p-${Extended.Version}/Slackware" />
@@ -2381,15 +2368,11 @@
            -->
             <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
             <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.21.v20160908" />
+            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" />
           <!--
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
            -->
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
-          <!--
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
-           -->
             <!-- anything added above, add in debian-tarball also -->
         </delete>
         <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
@@ -2405,10 +2388,6 @@
                 <exclude name="apps/susidns/src/lib/jstl.jar" />
            -->
                 <exclude name="apps/susidns/src/lib/standard.jar" />
-          <!--
-                <exclude name="apps/jetty/apache-tomcat/**"/>
-                <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
-           -->
                 <!-- anything added above, add in debian-tarball also -->
             </tarfileset>
             <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${release.number}" filemode="755">
diff --git a/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java b/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java
index 11e3777b1..da71628ee 100644
--- a/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java
+++ b/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java
@@ -453,6 +453,30 @@ class AMDInfoImpl extends CPUIDCPUInfo implements AMDCPUInfo
             modelString = "Jaguar";
           }
           break;
+
+        //Ryzen 7 (model 1), Ryzen 5 TBD
+        // untested
+          case 23: {
+            // Quote wikipedia:
+            // Zen is a clean sheet design that differs from the long-standing Bulldozer architecture.
+            // All models support: x87, MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AES, CLMUL,
+            // AVX, AVX2, FMA, CVT16/F16C, ABM, BMI1, BMI2, SHA.
+            isK6Compatible = true;
+            isK6_2_Compatible = true;
+            isK6_3_Compatible = true;
+            isAthlonCompatible = true;
+            isAthlon64Compatible = true;
+            // Pending testing of the bulldozer jbigi
+            //isPiledriverCompatible = true;
+            //isSteamrollerCompatible = true;
+            //isExcavatorCompatible = true;
+            //isBulldozerCompatible = true;
+            if (model == 1)
+               modelString = "Ryzen 7";
+            else
+               modelString = "Ryzen model " + model;
+          }
+          break;
         }
         return modelString;
     }
diff --git a/core/java/src/freenet/support/CPUInformation/CPUID.java b/core/java/src/freenet/support/CPUInformation/CPUID.java
index 3cbee478b..161cdb64d 100644
--- a/core/java/src/freenet/support/CPUInformation/CPUID.java
+++ b/core/java/src/freenet/support/CPUInformation/CPUID.java
@@ -51,11 +51,8 @@ public class CPUID {
     private static boolean _doLog = System.getProperty("jcpuid.dontLog") == null &&
                                     I2PAppContext.getGlobalContext().isRouterContext();
 
-    private static final boolean isX86 = System.getProperty("os.arch").contains("86") ||
-                                         System.getProperty("os.arch").equals("amd64");
+    private static final boolean isX86 = SystemVersion.isX86();
     private static final boolean isWindows = SystemVersion.isWindows();
-    private static final String libPrefix = isWindows ? "" : "lib";
-    private static final String libSuffix = isWindows ? ".dll" : ".so";
     private static final boolean isLinux = System.getProperty("os.name").toLowerCase(Locale.US).contains("linux");
     private static final boolean isKFreebsd = System.getProperty("os.name").toLowerCase(Locale.US).contains("kfreebsd");
     private static final boolean isFreebsd = (!isKFreebsd) && System.getProperty("os.name").toLowerCase(Locale.US).contains("freebsd");
@@ -304,13 +301,15 @@ public class CPUID {
      */
     public static CPUInfo getInfo() throws UnknownCPUException
     {
-        if(!_nativeOk)
-            throw new UnknownCPUException("Failed to read CPU information from the system. Please verify the existence of the jcpuid dll/so.");
+        if(!_nativeOk) {
+            throw new UnknownCPUException("Failed to read CPU information from the system. Please verify the existence of the " +
+                                          getLibraryPrefix() + "jcpuid " + getLibrarySuffix() + " file.");
+        }
         String id = getCPUVendorID();
         if(id.equals("CentaurHauls"))
             return new VIAInfoImpl();
         if(!isX86)
-            throw new UnknownCPUException("Failed to read CPU information from the system. The CPUID instruction exists on x86 CPU's only");
+            throw new UnknownCPUException("Failed to read CPU information from the system. The CPUID instruction exists on x86 CPUs only.");
         if(id.equals("AuthenticAMD"))
             return new AMDInfoImpl();
         if(id.equals("GenuineIntel"))
@@ -321,9 +320,23 @@ public class CPUID {
 
     public static void main(String args[])
     {
-        _doLog = true;
-        if(!_nativeOk){
-            System.out.println("**Failed to retrieve CPUInfo. Please verify the existence of jcpuid dll/so**");
+        _doLog = true; // this is too late to log anything from above
+        String path = System.getProperty("java.library.path");
+        String name = getLibraryPrefix() + "jcpuid" + getLibrarySuffix();
+        System.out.println("Native library search path: " + path);
+        if (_nativeOk) {
+            String sep = System.getProperty("path.separator");
+            String[] paths = DataHelper.split(path, sep);
+            for (String p : paths) {
+                File f = new File(p, name);
+                if (f.exists()) {
+                    System.out.println("Found native library: " + f);
+                    break;
+                }
+            }
+        } else {
+            System.out.println("Failed to retrieve CPUInfo. Please verify the existence of the " +
+                               name + " file in the library path, or set -Djava.library.path=. in the command line");
         }
         System.out.println("JCPUID Version: " + _jcpuidVersion);
         System.out.println(" **CPUInfo**");
@@ -498,12 +511,22 @@ public class CPUID {
      *
      */
     private static final boolean loadFromResource() {
+        // Mac info:
+        // Through 0.9.25, we had a libjcpuid-x86_64-osx.jnilib and a libjcpuid-x86-osx.jnilib file.
+        // As of 0.9.26, we have a single libjcpuid-x86_64-osx.jnilib fat binary that has both 64- and 32-bit support.
+        // For updates, the 0.9.27 update contained the new jbigi.jar.
+        // However, in rare cases, a user may have skipped that update, going straight
+        // from 0.9.26 to 0.9.28. Since we can't be sure, always try both for Mac.
+        // getResourceName64() returns non-null for 64-bit OR for 32-bit Mac.
+
         // try 64 bit first, if getResourceName64() returns non-null
         String resourceName = getResourceName64();
         if (resourceName != null) {
             boolean success = extractLoadAndCopy(resourceName);
             if (success)
                 return true;
+            if (_doLog)
+                System.err.println("WARNING: Resource name [" + resourceName + "] was not found");
         }
 
         // now try 32 bit
@@ -511,7 +534,6 @@ public class CPUID {
         boolean success = extractLoadAndCopy(resourceName);
         if (success)
             return true;
-
         if (_doLog)
             System.err.println("WARNING: Resource name [" + resourceName + "] was not found");
         return false;
@@ -531,7 +553,7 @@ public class CPUID {
             return false;
         File outFile = null;
         FileOutputStream fos = null;
-        String filename = libPrefix + "jcpuid" + libSuffix;
+        String filename = getLibraryPrefix() + "jcpuid" + getLibrarySuffix();
         try {
             InputStream libStream = resource.openStream();
             outFile = new File(I2PAppContext.getGlobalContext().getTempDir(), filename);
@@ -571,17 +593,20 @@ public class CPUID {
     /** @return non-null */
     private static final String getResourceName()
     {
-        return getLibraryPrefix()+getLibraryMiddlePart()+"."+getLibrarySuffix();
+        return getLibraryPrefix() + getLibraryMiddlePart() + getLibrarySuffix();
     }
 
     /**
-     * @return null if not on a 64 bit platform
+     * @return null if not on a 64 bit platform (except Mac)
      * @since 0.8.7
      */
     private static final String getResourceName64() {
-        if (!is64)
+        // As of GMP 6,
+        // libjcpuid-x86_64-osx.jnilib file is a fat binary that contains both 64- and 32-bit binaries
+        // See loadFromResource() for more info.
+        if (!is64 && !isMac)
             return null;
-        return getLibraryPrefix() + get64LibraryMiddlePart() + "." + getLibrarySuffix();
+        return getLibraryPrefix() + get64LibraryMiddlePart() + getLibrarySuffix();
     }
 
     private static final String getLibraryPrefix()
@@ -597,8 +622,14 @@ public class CPUID {
              return "jcpuid-x86-windows"; // The convention on Windows
 	if(isMac) {
 	    if(isX86) {
-	        return "jcpuid-x86-osx";  // The convention on Intel Macs
+                // As of GMP6,
+                // our libjcpuid-x86_64.osx.jnilib is a fat binary,
+                // with the 32-bit lib in it also.
+                // Not sure if that was on purpose...
+	        return "jcpuid-x86_64-osx";  // The convention on Intel Macs
 	    }
+            // this will fail, we don't have any ppc libs, but we can't return null here.
+	    return "jcpuid-ppc-osx";
 	}
         if(isKFreebsd)
             return "jcpuid-x86-kfreebsd"; // The convention on kfreebsd...
@@ -631,6 +662,8 @@ public class CPUID {
 	    if(isX86){
 	        return "jcpuid-x86_64-osx";
 	    }
+            // this will fail, we don't have any ppc libs, but we can't return null here.
+	    return "jcpuid-ppc_64-osx";
 	}
         if(isSunos)
             return "jcpuid-x86_64-solaris";
@@ -641,10 +674,10 @@ public class CPUID {
     private static final String getLibrarySuffix()
     {
         if(isWindows)
-            return "dll";
+            return ".dll";
 	if(isMac)
-	    return "jnilib";
+	    return ".jnilib";
 	else
-            return "so";
+            return ".so";
     }
 }
diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java
index 68b0dde82..98f324658 100644
--- a/core/java/src/net/i2p/I2PAppContext.java
+++ b/core/java/src/net/i2p/I2PAppContext.java
@@ -8,6 +8,7 @@ import java.util.Random;
 import java.util.Set;
 
 import net.i2p.app.ClientAppManager;
+import net.i2p.app.ClientAppManagerImpl;
 import net.i2p.client.naming.NamingService;
 import net.i2p.crypto.AESEngine;
 import net.i2p.crypto.CryptixAESEngine;
@@ -116,6 +117,7 @@ public class I2PAppContext {
     private final File _appDir;
     private volatile File _tmpDir;
     private final Random _tmpDirRand = new Random();
+    private final ClientAppManager _appManager;
     // split up big lock on this to avoid deadlocks
     private final Object _lock1 = new Object(), _lock2 = new Object(), _lock3 = new Object(), _lock4 = new Object(),
                          _lock5 = new Object(), _lock6 = new Object(), _lock7 = new Object(), _lock8 = new Object(),
@@ -198,6 +200,7 @@ public class I2PAppContext {
             _overrideProps.putAll(envProps);
         _shutdownTasks = new ConcurrentHashSet<Runnable>(32);
         _portMapper = new PortMapper(this);
+        _appManager = isRouterContext() ? null : new ClientAppManagerImpl(this);
     
    /*
     *  Directories. These are all set at instantiation and will not be changed by
@@ -1007,11 +1010,14 @@ public class I2PAppContext {
     }
 
     /**
-     *  The RouterAppManager in RouterContext, null always in I2PAppContext
-     *  @return null always
+     *  As of 0.9.30, returns non-null in I2PAppContext, null in RouterContext.
+     *  Prior to that, returned null always.
+     *  Overridden in RouterContext to return the RouterAppManager.
+     *
+     *  @return As of 0.9.30, returns non-null in I2PAppContext, null in RouterContext
      *  @since 0.9.11, in RouterContext since 0.9.4
      */
     public ClientAppManager clientAppManager() {
-        return null;
+        return _appManager;
     }
 }
diff --git a/core/java/src/net/i2p/app/ClientAppManagerImpl.java b/core/java/src/net/i2p/app/ClientAppManagerImpl.java
new file mode 100644
index 000000000..1c7342c42
--- /dev/null
+++ b/core/java/src/net/i2p/app/ClientAppManagerImpl.java
@@ -0,0 +1,67 @@
+package net.i2p.app;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+import net.i2p.I2PAppContext;
+
+/**
+ *  A simple ClientAppManager that supports register/unregister only,
+ *  so that client apps may find each other in AppContext.
+ *  See RouterAppManager for the real thing in RouterContext.
+ *
+ *  @since 0.9.30
+ */
+public class ClientAppManagerImpl implements ClientAppManager {
+    
+    // registered name to client
+    protected final ConcurrentHashMap<String, ClientApp> _registered;
+
+    public ClientAppManagerImpl(I2PAppContext ctx) {
+        _registered = new ConcurrentHashMap<String, ClientApp>(8);
+    }
+
+    /**
+     *  Does nothing.
+     *
+     *  @param app non-null
+     *  @param state non-null
+     *  @param message may be null
+     *  @param e may be null
+     */
+    public void notify(ClientApp app, ClientAppState state, String message, Exception e) {}
+    
+    /**
+     *  Register with the manager under the given name,
+     *  so that other clients may find it.
+     *  Only required for apps used by other apps.
+     *
+     *  @param app non-null
+     *  @return true if successful, false if duplicate name
+     */
+    public boolean register(ClientApp app) {
+        return _registered.putIfAbsent(app.getName(), app) == null;
+    }
+    
+    /**
+     *  Unregister with the manager. Name must be the same as that from register().
+     *  Only required for apps used by other apps.
+     *
+     *  @param app non-null
+     */
+    public void unregister(ClientApp app) {
+        _registered.remove(app.getName(), app);
+    }
+    
+    /**
+     *  Get a registered app.
+     *  Only used for apps finding other apps.
+     *  Do not hold a static reference.
+     *  If you only need to find a port, use the PortMapper instead.
+     *
+     *  @param name non-null
+     *  @return client app or null
+     */
+    public ClientApp getRegisteredApp(String name) {
+        return _registered.get(name);
+    }
+}
diff --git a/core/java/src/net/i2p/client/I2PSession.java b/core/java/src/net/i2p/client/I2PSession.java
index 069907d9c..d15c04aec 100644
--- a/core/java/src/net/i2p/client/I2PSession.java
+++ b/core/java/src/net/i2p/client/I2PSession.java
@@ -272,8 +272,10 @@ public interface I2PSession {
     public List<I2PSession> getSubsessions();
 
     /**
-     * Actually connect the session and start receiving/sending messages
-     *
+     * Actually connect the session and start receiving/sending messages.
+     * Connecting a primary session will not automatically connect subsessions.
+     * Connecting a subsession will automatically connect the primary session
+     * if not previously connected.
      */
     public void connect() throws I2PSessionException;
 
diff --git a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java
index 617a8512c..c5f7495cc 100644
--- a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java
+++ b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java
@@ -548,6 +548,10 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
      * Disconnect / destroy from another thread may be called simultaneously and
      * will (should?) interrupt the connect.
      *
+     * Connecting a primary session will not automatically connect subsessions.
+     * Connecting a subsession will automatically connect the primary session
+     * if not previously connected.
+     *
      * @throws I2PSessionException if there is a configuration error or the router is
      *                             not reachable
      */
diff --git a/core/java/src/net/i2p/client/impl/SubSession.java b/core/java/src/net/i2p/client/impl/SubSession.java
index 93a115bff..6a6706d62 100644
--- a/core/java/src/net/i2p/client/impl/SubSession.java
+++ b/core/java/src/net/i2p/client/impl/SubSession.java
@@ -93,6 +93,9 @@ class SubSession extends I2PSessionMuxedImpl {
      * Disconnect / destroy from another thread may be called simultaneously and
      * will (should?) interrupt the connect.
      *
+     * Connecting a subsession will automatically connect the primary session
+     * if not previously connected.
+     *
      * @throws I2PSessionException if there is a configuration error or the router is
      *                             not reachable
      */
diff --git a/core/java/src/net/i2p/client/naming/BlockfileNamingService.java b/core/java/src/net/i2p/client/naming/BlockfileNamingService.java
index 0c1f6a6d7..db30570da 100644
--- a/core/java/src/net/i2p/client/naming/BlockfileNamingService.java
+++ b/core/java/src/net/i2p/client/naming/BlockfileNamingService.java
@@ -15,6 +15,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
 import java.io.IOException;
+import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -418,10 +419,10 @@ public class BlockfileNamingService extends DummyNamingService {
             // version 3 -> version 4
             // support multiple destinations per hostname
             if (VersionComparator.comp(_version, "4") < 0) {
-                // Upgrade of 4K entry DB on RPi 2 is over 2 1/2 minutes, disable for now
-                if (SystemVersion.isAndroid() || SystemVersion.isARM()) {
+                // Upgrade of 4K entry DB on RPi 2 is over 2 1/2 minutes, probably worse on Android, disable for now
+                if (SystemVersion.isAndroid()) {
                     if (_log.shouldWarn())
-                        _log.warn("Deferring upgrade to version 4 on Android/ARM");
+                        _log.warn("Deferring upgrade to version 4 on Android");
                     return true;
                 }
                 SkipList<String, Properties> hdr = _bf.getIndex(INFO_SKIPLIST, _stringSerializer, _infoSerializer);
@@ -1291,6 +1292,132 @@ public class BlockfileNamingService extends DummyNamingService {
         }
     }
 
+    /**
+     *  Export in a hosts.txt format.
+     *  Output is sorted.
+     *  Caller must close writer.
+     *
+     *  @param options If non-null and contains the key "list", get
+     *                from that list (default "hosts.txt", NOT all lists)
+     *                Key "search": return only those matching substring
+     *                Key "startsWith": return only those starting with
+     *                                  ("[0-9]" allowed)
+     *                Key "beginWith": start here in the iteration
+     *  @since 0.9.30 override NamingService to add stored authentication strings
+     */
+    @Override
+    public void export(Writer out, Properties options) throws IOException {
+        String listname = FALLBACK_LIST;
+        String search = null;
+        String startsWith = null;
+        String beginWith = null;
+        if (options != null) {
+            String ln = options.getProperty("list");
+            if (ln != null)
+                listname = ln;
+            search = options.getProperty("search");
+            startsWith = options.getProperty("startsWith");
+            beginWith = options.getProperty("beginWith");
+            if (beginWith == null && startsWith != null) {
+                if (startsWith.equals("[0-9]"))
+                    beginWith = "0";
+                else
+                    beginWith = startsWith;
+            }
+        }
+        out.write("# Address book: ");
+        out.write(getName());
+        out.write(" (" + listname + ')');
+        final String nl = System.getProperty("line.separator", "\n");
+        out.write(nl);
+        out.write("# Exported: ");
+        out.write((new Date()).toString());
+        out.write(nl);
+        synchronized(_bf) {
+            if (_isClosed)
+                return;
+            try {
+                SkipList<String, DestEntry> sl = _bf.getIndex(listname, _stringSerializer, _destSerializer);
+                if (sl == null) {
+                    if (_log.shouldLog(Log.WARN))
+                        _log.warn("No skiplist found for lookup in " + listname);
+                    return;
+                }
+                if (beginWith == null && search == null) {
+                    int sz = sl.size();
+                    if (sz <= 0) {
+                        out.write("# No entries");
+                        out.write(nl);
+                        return;
+                    }
+                    if (sz > 1) {
+                        // actually not right due to multidest
+                        out.write("# " + sz + " entries");
+                        out.write(nl);
+                    }
+                }
+                SkipIterator<String, DestEntry> iter;
+                if (beginWith != null)
+                    iter = sl.find(beginWith);
+                else
+                    iter = sl.iterator();
+                int cnt = 0;
+                while (iter.hasNext()) {
+                    String key = iter.nextKey();
+                    if (startsWith != null) {
+                        if (startsWith.equals("[0-9]")) {
+                            if (key.charAt(0) > '9')
+                                break;
+                        } else if (!key.startsWith(startsWith)) {
+                            break;
+                        }
+                    }
+                    DestEntry de = iter.next();
+                    if (!validate(key, de, listname))
+                        continue;
+                    if (search != null && key.indexOf(search) < 0)
+                        continue;
+                    int dsz = de.destList != null ? de.destList.size() : 1;
+                    // new non-DSA dest is put first, so put in reverse
+                    // order so importers will see the older dest first
+                    for (int i = dsz - 1; i >= 0; i--) {
+                        Properties p;
+                        Destination d;
+                        if (i == 0) {
+                            p = de.props;
+                            d = de.dest;
+                        } else {
+                            p = de.propsList.get(i);
+                            d = de.destList.get(i);
+                        }
+                        out.write(key);
+                        out.write('=');
+                        out.write(d.toBase64());
+                        if (p != null)
+                            SingleFileNamingService.writeOptions(p, out);
+                        out.write(nl);
+                        cnt++;
+                    }
+                }
+                if (beginWith != null || search != null) {
+                    if (cnt <= 0) {
+                        out.write("# No entries");
+                        out.write(nl);
+                        return;
+                    }
+                    if (cnt > 1) {
+                        out.write("# " + cnt + " entries");
+                        out.write(nl);
+                    }
+                }
+            } catch (RuntimeException re) {
+                throw new IOException("DB lookup error", re);
+            } finally {
+                deleteInvalid();
+            }
+        }
+    }
+
     /**
      * @param options If non-null and contains the key "list", get
      *                from that list (default "hosts.txt", NOT all lists)
@@ -1578,6 +1705,11 @@ public class BlockfileNamingService extends DummyNamingService {
                     }
                     storedOptions.remove(i);
                     removeReverseEntry(hostname, d);
+                    if (options != null) {
+                        String list = options.getProperty("list");
+                        if (list != null)
+                            storedOptions.get(0).setProperty("list", list);
+                    }
                     return put(hostname, newDests, storedOptions, false);
                 }
             }
diff --git a/core/java/src/net/i2p/client/naming/SingleFileNamingService.java b/core/java/src/net/i2p/client/naming/SingleFileNamingService.java
index 4eb2536fb..74d05224c 100644
--- a/core/java/src/net/i2p/client/naming/SingleFileNamingService.java
+++ b/core/java/src/net/i2p/client/naming/SingleFileNamingService.java
@@ -268,9 +268,9 @@ public class SingleFileNamingService extends NamingService {
      *  Does not write a newline.
      *
      *  @param options non-null
-     *  @since 0.9.26
+     *  @since 0.9.26, package private since 0.9.30
      */
-    private static void writeOptions(Properties options, Writer out) throws IOException {
+    static void writeOptions(Properties options, Writer out) throws IOException {
         boolean started = false;
         for (Map.Entry<Object, Object> e : options.entrySet()) {
             String k = (String) e.getKey();
diff --git a/core/java/src/net/i2p/crypto/KeyGenerator.java b/core/java/src/net/i2p/crypto/KeyGenerator.java
index 6a087c50a..56f934683 100644
--- a/core/java/src/net/i2p/crypto/KeyGenerator.java
+++ b/core/java/src/net/i2p/crypto/KeyGenerator.java
@@ -116,11 +116,7 @@ public final class KeyGenerator {
 
     /** @since 0.9.8 */
     private static final boolean DEFAULT_USE_LONG_EXPONENT =
-                                                   NativeBigInteger.isNative() &&
-                                                   SystemVersion.is64Bit() &&
-                                                   !SystemVersion.isGNU() &&
-                                                   !SystemVersion.isApache() &&
-                                                   !SystemVersion.isARM();
+                                                   !SystemVersion.isSlow();
 
     /**
      *  @deprecated use getElGamalExponentSize() which allows override in the properties
diff --git a/core/java/src/net/i2p/crypto/KeyStoreUtil.java b/core/java/src/net/i2p/crypto/KeyStoreUtil.java
index 6814dc1ee..89689fe5d 100644
--- a/core/java/src/net/i2p/crypto/KeyStoreUtil.java
+++ b/core/java/src/net/i2p/crypto/KeyStoreUtil.java
@@ -422,10 +422,11 @@ public final class KeyStoreUtil {
         } catch (CertificateExpiredException cee) {
             String s = "Rejecting expired X509 Certificate: " + file.getAbsolutePath();
             // Android often has old system certs
-            if (SystemVersion.isAndroid())
+            // our SSL certs may be old also
+            //if (SystemVersion.isAndroid())
                 warn(s, cee);
-            else
-                error(s, cee);
+            //else
+            //    error(s, cee);
             return false;
         } catch (CertificateNotYetValidException cnyve) {
             error("Rejecting X509 Certificate not yet valid: " + file.getAbsolutePath(), cnyve);
diff --git a/core/java/src/net/i2p/crypto/TrustedUpdate.java b/core/java/src/net/i2p/crypto/TrustedUpdate.java
index d980f8a45..23520942b 100644
--- a/core/java/src/net/i2p/crypto/TrustedUpdate.java
+++ b/core/java/src/net/i2p/crypto/TrustedUpdate.java
@@ -23,7 +23,7 @@ import net.i2p.data.SigningPublicKey;
 import net.i2p.util.Log;
 import net.i2p.util.SecureFileOutputStream;
 import net.i2p.util.VersionComparator;
-import net.i2p.util.ZipFileComment;
+//import net.i2p.util.ZipFileComment;
 
 /**
  * <p>Handles DSA signing and verification of update files.
@@ -611,9 +611,10 @@ riCe6OlAEiNpcc6mMyIYYWFICbrDFTrDR3wXqwc/Jkcx6L5VVWoagpSzbo3yGhc=
      *
      * @since 0.8.8
      */
+    @SuppressWarnings("deprecation")
     private boolean verifyVersionMatch(File signedFile) {
         try {
-             String zipComment = ZipFileComment.getComment(signedFile, VERSION_BYTES, HEADER_BYTES);
+             String zipComment = net.i2p.util.ZipFileComment.getComment(signedFile, VERSION_BYTES, HEADER_BYTES);
              return zipComment.equals(_newVersion);
         } catch (IOException ioe) {}
         return false;
diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
index 5a46a7cbe..e4e322c8d 100644
--- a/core/java/src/net/i2p/data/DataHelper.java
+++ b/core/java/src/net/i2p/data/DataHelper.java
@@ -46,6 +46,7 @@ import net.i2p.util.OrderedProperties;
 import net.i2p.util.ReusableGZIPInputStream;
 import net.i2p.util.ReusableGZIPOutputStream;
 import net.i2p.util.SecureFileOutputStream;
+import net.i2p.util.SystemVersion;
 import net.i2p.util.Translate;
 
 /**
@@ -55,6 +56,9 @@ import net.i2p.util.Translate;
  */
 public class DataHelper {
 
+    /** See storeProps(). 600-750 ms on RPi. */
+    private static final boolean SHOULD_SYNC = !(SystemVersion.isAndroid() || SystemVersion.isARM());
+
     /**
      *  Map of String to itself to cache common
      *  keys in RouterInfo, RouterAddress, and BlockfileNamingService properties.
@@ -68,9 +72,9 @@ public class DataHelper {
             "cost", "host", "port",
             // SSU RouterAddress options
             "key", "mtu",
-            "ihost0", "iport0", "ikey0", "itag0",
-            "ihost1", "iport1", "ikey1", "itag1",
-            "ihost2", "iport2", "ikey2", "itag2",
+            "ihost0", "iport0", "ikey0", "itag0", "iexp0",
+            "ihost1", "iport1", "ikey1", "itag1", "iexp1",
+            "ihost2", "iport2", "ikey2", "itag2", "iexp2",
             // RouterInfo options
             "caps", "coreVersion", "netId", "router.version",
             "netdb.knownLeaseSets", "netdb.knownRouters",
@@ -514,8 +518,10 @@ public class DataHelper {
                 }
                 out.println(name + "=" + val);
             }
-            out.flush();
-            fos.getFD().sync();
+            if (SHOULD_SYNC) {
+                out.flush();
+                fos.getFD().sync();
+            }
             out.close();
             if (out.checkError()) {
                 out = null;
diff --git a/core/java/src/net/i2p/time/BuildTime.java b/core/java/src/net/i2p/time/BuildTime.java
index be47ce7a1..7f126ed56 100644
--- a/core/java/src/net/i2p/time/BuildTime.java
+++ b/core/java/src/net/i2p/time/BuildTime.java
@@ -34,7 +34,10 @@ public class BuildTime {
     private static final long _latestTime;
     private static final long YEARS_25 = 25L*365*24*60*60*1000;
     /** update this periodically */
-    private static final String EARLIEST = "2016-02-19 12:00:00 UTC";
+    private static final String EARLIEST = "2017-03-27 12:00:00 UTC";
+    // fallback if parse fails ticket #1976
+    // date -d 201x-xx-xx +%s
+    private static final long EARLIEST_LONG = 1490587200 * 1000L;
 
     static {
         // this is the standard format of build.timestamp as set in the top-level build.xml
@@ -45,12 +48,15 @@ public class BuildTime {
         try {
             Date date = fmt.parse(EARLIEST);
             if (date == null)
-                throw new RuntimeException("BuildTime FAIL");
-            min = date.getTime();
+                min = EARLIEST_LONG;
+            else
+                min = date.getTime();
         } catch (ParseException pe) {
             System.out.println("BuildTime FAIL");
-            pe.printStackTrace();
-            throw new RuntimeException("BuildTime FAIL", pe);
+            // Old Android, ticket #1976
+            //pe.printStackTrace();
+            //throw new RuntimeException("BuildTime FAIL", pe);
+            min = EARLIEST_LONG;
         }
         long max = min + YEARS_25;
         long build = getBuildTime(fmt, "i2p.jar");
diff --git a/core/java/src/net/i2p/util/ByteCache.java b/core/java/src/net/i2p/util/ByteCache.java
index c68616375..3600994b9 100644
--- a/core/java/src/net/i2p/util/ByteCache.java
+++ b/core/java/src/net/i2p/util/ByteCache.java
@@ -87,7 +87,7 @@ public final class ByteCache {
         if (cache == null) {
             cache = new ByteCache(cacheSize, size);
             _caches.put(sz, cache);
-;       }
+        }
         cache.resize(cacheSize);
         //I2PAppContext.getGlobalContext().logManager().getLog(ByteCache.class).error("ByteCache size: " + size + " max: " + cacheSize, new Exception("from"));
         return cache;
diff --git a/core/java/src/net/i2p/util/FortunaRandomSource.java b/core/java/src/net/i2p/util/FortunaRandomSource.java
index f03453b7c..be1613fd3 100644
--- a/core/java/src/net/i2p/util/FortunaRandomSource.java
+++ b/core/java/src/net/i2p/util/FortunaRandomSource.java
@@ -108,12 +108,13 @@ public class FortunaRandomSource extends RandomSource implements EntropyHarveste
 
         // get at least 4 extra bits if possible for better
         // distribution after the %
+        // No extra needed if power of two.
         int numBits;
-        if (n > 0xfffff)
+        if (n > 0x100000)
             numBits = 31;
-        else if (n > 0xfff)
+        else if (n > 0x1000)
             numBits = 24;
-        else if (n > 0xf)
+        else if (n > 0x10)
             numBits = 16;
         else
             numBits = 8;
diff --git a/core/java/src/net/i2p/util/NativeBigInteger.java b/core/java/src/net/i2p/util/NativeBigInteger.java
index 2b435b286..bbd40912e 100644
--- a/core/java/src/net/i2p/util/NativeBigInteger.java
+++ b/core/java/src/net/i2p/util/NativeBigInteger.java
@@ -209,6 +209,9 @@ public class NativeBigInteger extends BigInteger {
      * Really this could be represented by a DAG, but the benefits don't
      * outweigh the implementation time.
      */
+
+    // none -> {"none"), since 0.9.30
+    private final static String[] JBIGI_COMPAT_LIST_NONE          = {JBIGI_OPTIMIZATION_X86};
     private final static String[] JBIGI_COMPAT_LIST_PPC           = {JBIGI_OPTIMIZATION_PPC};
     private final static String[] JBIGI_COMPAT_LIST_ARM           = {JBIGI_OPTIMIZATION_ARM_CORTEX_A15, JBIGI_OPTIMIZATION_ARM_CORTEX_A9, JBIGI_OPTIMIZATION_ARM_CORTEX_A8,
                                                                      JBIGI_OPTIMIZATION_ARM_CORTEX_A7, JBIGI_OPTIMIZATION_ARM_CORTEX_A5, JBIGI_OPTIMIZATION_ARM_ARMV7,
@@ -231,11 +234,14 @@ public class NativeBigInteger extends BigInteger {
     private final static String[] JBIGI_COMPAT_LIST_INTEL_CORE    = {JBIGI_OPTIMIZATION_COREI_BWL, JBIGI_OPTIMIZATION_COREI_HWL, JBIGI_OPTIMIZATION_COREI_SBR,
                                                                      JBIGI_OPTIMIZATION_COREI, JBIGI_OPTIMIZATION_CORE2, JBIGI_OPTIMIZATION_PENTIUMM,
                                                                      JBIGI_OPTIMIZATION_PENTIUM3, JBIGI_OPTIMIZATION_X86};
+
     /**
      * The mapping between CPU architecture and its compatibility list.
      */
     @SuppressWarnings("serial")
     private final static HashMap<String, String[]> JBIGI_COMPAT_MAP = new HashMap<String, String[]>() {{
+        // none -> {"none"), since 0.9.30
+        put(JBIGI_OPTIMIZATION_X86, JBIGI_COMPAT_LIST_NONE);
         put(JBIGI_OPTIMIZATION_PPC, JBIGI_COMPAT_LIST_PPC);
 
         put(JBIGI_OPTIMIZATION_ARM_ARMV5,      JBIGI_COMPAT_LIST_ARM);
@@ -406,10 +412,11 @@ public class NativeBigInteger extends BigInteger {
                     if (intelcpu.IsPentiumCompatible())
                         return JBIGI_OPTIMIZATION_PENTIUM;
                 }
-                return null;
             } catch (UnknownCPUException e) {
-                return null;
             }
+            // always try "none" if we don't know the x86 type,
+            // in case of CPUID fail or not finding compatibility above
+            return JBIGI_OPTIMIZATION_X86;
         } else if (_isArm) {
             if (_isWin)
                 return null;
@@ -739,9 +746,25 @@ public class NativeBigInteger extends BigInteger {
      */
     public static void main(String args[]) {
         _doLog = true;
+        String path = System.getProperty("java.library.path");
+        String name = _libPrefix + "jbigi" + _libSuffix;
+        System.out.println("Native library search path: " + path);
+        if (_nativeOk) {
+            String sep = System.getProperty("path.separator");
+            String[] paths = DataHelper.split(path, sep);
+            for (String p : paths) {
+                File f = new File(p, name);
+                if (f.exists()) {
+                    System.out.println("Found native library: " + f);
+                    break;
+                }
+            }
+        } else {
+            System.out.println("Failed to load native library. Please verify the existence of the " +
+                               name + " file in the library path, or set -Djava.library.path=. in the command line");
+        }
         boolean nativeOnly = args.length > 0 && args[0].equals("-n");
         if (nativeOnly && !_nativeOk) {
-            System.out.println("Failed to load native library");
             System.exit(1);
         }
         if (_nativeOk) {
@@ -959,7 +982,7 @@ public class NativeBigInteger extends BigInteger {
                     List<String> toTry = getResourceList();
                     debug("loadResource list to try is: " + toTry);
                     for (String s : toTry) {
-                        System.out.println("trying to load resource: " + s);
+                        debug("Trying to load resource " + s);
                         if (loadFromResource(s)) {
                             _nativeOk = true;
                             _extractedResource = s;
@@ -1092,7 +1115,7 @@ public class NativeBigInteger extends BigInteger {
         //URL resource = NativeBigInteger.class.getClassLoader().getResource(resourceName);
         URL resource = ClassLoader.getSystemResource(resourceName);
         if (resource == null) {
-            System.out.println("Resource name [" + resourceName + "] was not found");
+            info("Resource name [" + resourceName + "] was not found");
             return false;
         }
 
@@ -1107,15 +1130,15 @@ public class NativeBigInteger extends BigInteger {
             fos.close();
             fos = null;
             System.load(outFile.getAbsolutePath()); //System.load requires an absolute path to the lib
-            System.out.println("Loaded library: " + resource);
+            info("Loaded library: " + resource);
         } catch (UnsatisfiedLinkError ule) {
             // don't include the exception in the message - too much
-            System.out.println("Failed to load the resource " + resourceName + " - not a valid library for this platform");
+            warn("Failed to load the resource " + resourceName + " - not a valid library for this platform");
             if (outFile != null)
                 outFile.delete();
             return false;
         } catch (IOException ioe) {
-            System.out.println("Problem writing out the temporary native library data: " + ioe.toString());
+            warn("Problem writing out the temporary native library data: " + ioe);
             if (outFile != null)
                 outFile.delete();
             return false;
@@ -1141,6 +1164,7 @@ public class NativeBigInteger extends BigInteger {
             return Collections.emptyList();
         List<String> rv = new ArrayList<String>(20);
         String primary = getMiddleName2(true);
+        // primary may be null
         String[] compatList = JBIGI_COMPAT_MAP.get(primary);
 
         if (primary != null && compatList == null) {
@@ -1222,12 +1246,14 @@ public class NativeBigInteger extends BigInteger {
     /**
      *  @return may be null if optimized is true; returns jbigi-xxx-none if optimize is false
      */
+/****
     private static final String getMiddleName(boolean optimized) {
         String m2 = getMiddleName2(optimized);
         if (m2 == null)
             return null;
         return getMiddleName1() + m2;
     }
+****/
 
     /**
      *  @return may be null if optimized is true; returns "none" if optimize is false
diff --git a/core/java/src/net/i2p/util/SystemVersion.java b/core/java/src/net/i2p/util/SystemVersion.java
index 3c1880f2d..14774cac1 100644
--- a/core/java/src/net/i2p/util/SystemVersion.java
+++ b/core/java/src/net/i2p/util/SystemVersion.java
@@ -39,6 +39,7 @@ public abstract class SystemVersion {
     private static final boolean _is64;
     private static final boolean _hasWrapper = System.getProperty("wrapper.version") != null;
     private static final boolean _isLinuxService;
+    private static final boolean _isSlow;
 
     private static final boolean _oneDotSix;
     private static final boolean _oneDotSeven;
@@ -69,6 +70,7 @@ public abstract class SystemVersion {
         _isLinuxService = !_isWin && !_isMac && !_isAndroid &&
                           (DAEMON_USER.equals(System.getProperty("user.name")) ||
                            (_isGentoo && GENTOO_USER.equals(System.getProperty("user.name"))));
+        _isSlow = _isAndroid || _isApache || _isArm || _isGNU || getMaxMemory() < 48*1024*1024L;
 
         int sdk = 0;
         if (_isAndroid) {
@@ -153,6 +155,18 @@ public abstract class SystemVersion {
         return _isX86;
     }
 
+    /**
+     *  Our best guess on whether this is a slow architecture / OS / JVM,
+     *  using some simple heuristics.
+     *
+     *  @since 0.9.30
+     */
+    public static boolean isSlow() {
+        // we don't put the NBI call in the static field,
+        // to prevent a circular initialization with NBI.
+        return _isSlow || !NativeBigInteger.isNative();
+    }
+
     /**
      *  Better than (new VersionComparator()).compare(System.getProperty("java.version"), "1.6") &gt;= 0
      *  as it handles Android also, where java.version = "0".
@@ -290,6 +304,7 @@ public abstract class SystemVersion {
         System.out.println("Linux Svc: " + isLinuxService());
         System.out.println("Mac      : " + isMac());
         System.out.println("OpenJDK  : " + isOpenJDK());
+        System.out.println("Slow     : " + isSlow());
         System.out.println("Windows  : " + isWindows());
         System.out.println("Wrapper  : " + hasWrapper());
         System.out.println("x86      : " + isX86());
diff --git a/core/java/src/net/i2p/util/ZipFileComment.java b/core/java/src/net/i2p/util/ZipFileComment.java
index b0d590fea..6be6fdbf8 100644
--- a/core/java/src/net/i2p/util/ZipFileComment.java
+++ b/core/java/src/net/i2p/util/ZipFileComment.java
@@ -19,8 +19,10 @@ import net.i2p.data.DataHelper;
  * http://www.flattermann.net/2009/01/read-a-zip-file-comment-with-java/
  * Beerware.
  *
- * since 0.8.8
+ * @deprecated scheduled for removal late 2017, not for external use
+ * @since 0.8.8
  */
+@Deprecated
 public abstract class ZipFileComment {
 
     private static final int BLOCK_LEN = 22;
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/doc/debian-build.txt b/debian-alt/doc/debian-build.txt
index a9fe5bece..38f7805d4 100644
--- a/debian-alt/doc/debian-build.txt
+++ b/debian-alt/doc/debian-build.txt
@@ -97,7 +97,22 @@ reprepro -v -A i386 copy jessie trusty libjbigi-jni
 # Note that syntax is reprepro copysrc TO FROM package!
 reprepro -v copysrc sid jessie i2p
 
+# install in the architectures not copied from ubuntu
+# 'flood' should do this but forgot how, can't make it work any more
+reprepro -v -A 'armel|armhf|powerpc' includedeb wheezy i2p_0.9.xxp-1ubuntu1_all.deb
+reprepro -v -A 'armel|armhf|powerpc' includedeb wheezy i2p-doc_0.9.xxp-1ubuntu1_all.deb
+reprepro -v -A 'armel|armhf|powerpc' includedeb wheezy i2p-router_0.9.xxp-1ubuntu1_all.deb
+reprepro -v -A 'armel|armhf|powerpc' includedeb jessie i2p_0.9.xx-1ubuntu1_all.deb
+reprepro -v -A 'armel|armhf|powerpc' includedeb jessie i2p-doc_0.9.xx-1ubuntu1_all.deb
+reprepro -v -A 'armel|armhf|powerpc' includedeb jessie i2p-router_0.9.xx-1ubuntu1_all.deb
+reprepro -v -A 'armel|armhf' includedeb sid i2p_0.9.xx-1ubuntu1_all.deb
+reprepro -v -A 'armel|armhf' includedeb sid i2p-doc_0.9.xx-1ubuntu1_all.deb
+reprepro -v -A 'armel|armhf' includedeb sid i2p-router_0.9.xx-1ubuntu1_all.deb
+
+
 
 # check status
 reprepro ls i2p
+reprepro ls i2p-doc
+reprepro ls i2p-router
 reprepro ls libjbigi-jni
diff --git a/debian-alt/doc/dependencies.txt b/debian-alt/doc/dependencies.txt
index 23ea68a24..05fb581f4 100644
--- a/debian-alt/doc/dependencies.txt
+++ b/debian-alt/doc/dependencies.txt
@@ -41,8 +41,8 @@ Current Runtime Dependencies
   For /usr/share/java/gnu-getopt.jar.
   In non-Debian builds we bundle the source code; it's removed in the Debian source package.
 
-* libjetty8-java
-  For /usr/share/java/jetty8-*.jar.
+* libjetty9-java
+  For /usr/share/java/jetty9-*.jar.
   In non-Debian builds we bundle the jars; it's removed in the Debian source package.
   For some Debian and Ubuntu releases, these seem to be much older than what we're bundling,
   which is 8.1.21, but there's no particular version that we need.
@@ -52,7 +52,7 @@ Current Runtime Dependencies
   Jetty 9.2.x is in recent Ubuntu and Debian.
   Jetty 9 ticket is https://trac.i2p2.de/ticket/1512
   Updating Jetty may break external plugins. Extensive testing is required.
-  Note that the libjetty8-java dependency brings in libservlet3.0-java which we require.
+  Note that the libjetty9-java dependency brings in libservlet3.0-java which we require.
 
 * glassfish-javaee
   We need jstl.jar and standard.jar version 1.2.
diff --git a/debian-alt/jessie/README.txt b/debian-alt/jessie/README.txt
new file mode 100644
index 000000000..eb5df3792
--- /dev/null
+++ b/debian-alt/jessie/README.txt
@@ -0,0 +1,4 @@
+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,
+or use the files here to depend on libtomcat8-java.
diff --git a/debian-alt/jessie/control b/debian-alt/jessie/control
new file mode 100644
index 000000000..e5c9401ec
--- /dev/null
+++ b/debian-alt/jessie/control
@@ -0,0 +1,109 @@
+Source: i2p
+Maintainer: zzz <zzz@i2pmail.org>
+Section: net
+Standards-Version: 3.9.6
+Priority: optional
+Bugs: mailto:zzz@i2pmail.org
+Homepage: https://geti2p.net/
+Build-Depends: debhelper (>= 7.0.50~)
+ ,ant (>= 1.8)
+ ,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
+ ,libgmp-dev (>= 2:5.0.2)
+ ,libservice-wrapper-java
+ ,hardening-wrapper
+ ,po-debconf
+
+Package: i2p
+Architecture: all
+Section: net
+Priority: optional
+Depends: ${java:Depends}, ${shlibs:Depends},
+ adduser,
+ debconf,
+ i2p-router (>= 0.8.6-5),
+ libjbigi-jni,
+ lsb-base,
+ service-wrapper
+Description: I2P anonymous network
+ I2P is an anonymizing network, offering a simple layer that identity-sensitive
+ applications can use to securely communicate. All data is wrapped with several
+ layers of encryption, and the network is both distributed and dynamic, with no
+ trusted parties.
+ .
+ This package depends on the router, jbigi, the java service wrapper, and
+ includes support to run I2P as a daemon.
+
+Package: libjbigi-jni
+Architecture: any
+Section: java
+Priority: optional
+Depends: ${shlibs:Depends}, i2p-router
+Homepage: https://geti2p.net/
+Description: I2P libjbigi library
+ This Package contains the libjbigi JNI library (and on x86 platforms, jcpuid).
+ .
+ libjbigi is a math library that is part of the I2P installation.  Use of this
+ library greatly enhances the efficiency of cryptographic algorithms, such as
+ the ones used by I2P. You can expect to see a 5-7x speed improvement on certain
+ tasks, such as elGamal encryption/decryption.
+
+Package: i2p-doc
+Architecture: all
+Section: doc
+Priority: extra
+Depends: ${misc:Depends}
+Suggests: i2p, default-jdk-doc
+Description: I2P developer documentation
+ I2P is an anonymizing network, offering a simple layer that identity-sensitive
+ applications can use to securely communicate. All data is wrapped with several
+ layers of encryption, and the network is both distributed and dynamic, with no
+ trusted parties.
+ .
+ This package contains the Javadoc files.
+
+Package: i2p-router
+Architecture: all
+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,
+ libtomcat8-java,
+ geoip-database,
+ gettext-base,
+ libgetopt-java,
+Replaces: i2p ( << 0.8.6-5)
+Breaks: i2p (<< 0.8.6-5)
+Recommends: libjbigi-jni, ttf-dejavu
+Suggests: tor
+ ,apparmor
+ ,i2p-messenger
+ ,i2phex
+ ,i2p-tahoe-lafs
+ ,imule
+ ,irc-client
+ ,itoopie
+ ,mail-client
+ ,mail-reader
+ ,news-reader
+ ,polipo
+ ,privoxy
+ ,robert
+ ,syndie
+ ,www-browser
+ ,xul-ext-torbutton
+Description: I2P router
+ I2P is an anonymizing network, offering a simple layer that identity-sensitive
+ applications can use to securely communicate. All data is wrapped with several
+ layers of encryption, and the network is both distributed and dynamic, with no
+ trusted parties.
+ .
+ TrueType fonts (such as those provided in the package ttf-dejavu) are required
+ in order to generate graphs.
diff --git a/debian-alt/jessie/i2p-router.install b/debian-alt/jessie/i2p-router.install
new file mode 100644
index 000000000..630790e5b
--- /dev/null
+++ b/debian-alt/jessie/i2p-router.install
@@ -0,0 +1,73 @@
+# history.txt is installed to /usr/share/i2p because
+# it's shown in the router console at http://127.0.0.1:7657
+# (this is also why I don't use dh_installchangelogs -k for it)
+history.txt usr/share/i2p
+
+pkg-temp/blocklist.txt usr/share/i2p
+pkg-temp/certificates usr/share/i2p
+pkg-temp/clients.config usr/share/i2p
+pkg-temp/docs usr/share/i2p/
+pkg-temp/eepget usr/bin
+pkg-temp/eepsite usr/share/i2p
+pkg-temp/geoip usr/share/i2p
+pkg-temp/hosts.txt usr/share/i2p
+pkg-temp/i2prouter-nowrapper usr/bin
+pkg-temp/i2psnark.config usr/share/i2p
+pkg-temp/i2ptunnel.config usr/share/i2p
+pkg-temp/router.config usr/share/i2p
+pkg-temp/systray.config usr/share/i2p
+pkg-temp/webapps usr/share/i2p
+
+
+pkg-temp/lib/addressbook.jar usr/share/i2p/lib
+pkg-temp/lib/BOB.jar usr/share/i2p/lib
+pkg-temp/lib/desktopgui.jar usr/share/i2p/lib
+pkg-temp/lib/i2p.jar usr/share/i2p/lib
+pkg-temp/lib/i2psnark.jar usr/share/i2p/lib
+pkg-temp/lib/i2ptunnel.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-i2p.jar usr/share/i2p/lib
+pkg-temp/lib/jrobin.jar usr/share/i2p/lib
+pkg-temp/lib/mstreaming.jar usr/share/i2p/lib
+pkg-temp/lib/routerconsole.jar usr/share/i2p/lib
+pkg-temp/lib/router.jar usr/share/i2p/lib
+pkg-temp/lib/sam.jar usr/share/i2p/lib
+pkg-temp/lib/streaming.jar usr/share/i2p/lib
+pkg-temp/lib/systray.jar usr/share/i2p/lib
+
+
+# uncomment if not building with libjetty9-java
+# ubuntu: in trusty vivid wily xenial
+# debian: in wheezy jessie stretch sid
+pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-deploy.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-http.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-io.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-security.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-servlet.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-servlets.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-start.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-util.jar usr/share/i2p/lib
+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
+
+
+# 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/javax.servlet.jar usr/share/i2p/lib
+
+
+# uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java
+# ubuntu and debian: everywhere
+# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
+pkg-temp/lib/jstl.jar usr/share/i2p/lib
+
+
+# uncomment if not building with either glassfish-javaee or libjstl1.1-java
+# ubuntu and debian: everywhere
+#pkg-temp/lib/standard.jar usr/share/i2p/lib
diff --git a/debian-alt/jessie/i2p-router.links b/debian-alt/jessie/i2p-router.links
new file mode 100644
index 000000000..d85cf86ee
--- /dev/null
+++ b/debian-alt/jessie/i2p-router.links
@@ -0,0 +1,85 @@
+usr/share/common-licenses/GPL-2 usr/share/doc/i2p-router/licenses/LICENSE-GPLv2.txt
+usr/share/common-licenses/LGPL-2.1 usr/share/doc/i2p-router/licenses/LICENSE-LGPLv2.1.txt
+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
+
+
+# comment out if not building with libjetty9-java
+# ubuntu: in trusty vivid wily xenial
+# debian: in wheezy jessie stretch sid
+#usr/share/java/jetty9-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
+#usr/share/java/jetty9-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
+#usr/share/java/jetty9-http.jar usr/share/i2p/lib/jetty-http.jar
+#usr/share/java/jetty9-io.jar usr/share/i2p/lib/jetty-io.jar
+# legacy name in lib/
+#usr/share/java/jetty9-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
+#usr/share/java/jetty9-security.jar usr/share/i2p/lib/jetty-security.jar
+#usr/share/java/jetty9-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
+#usr/share/java/jetty9-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
+#usr/share/java/jetty9-start.jar usr/share/i2p/lib/jetty-start.jar
+#usr/share/java/jetty9-util.jar usr/share/i2p/lib/jetty-util.jar
+#usr/share/java/jetty9-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
+#usr/share/java/jetty9-xml.jar usr/share/i2p/lib/jetty-xml.jar
+# legacy name in lib/
+#usr/share/java/jetty9-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
+# legacy name in lib/
+#usr/share/java/jetty9-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
+# following two are from libservlet3.1-java which is a dependency of libjetty9-java
+# legacy name in lib/
+#usr/share/java/servlet-api-3.1.jar usr/share/i2p/lib/javax.servlet.jar
+# combined into javax.servlet.jar in non-package builds
+#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
+usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar
+
+
+# comment out if not building with libjakarta-taglibs-standard-java
+# ubuntu and debian: everywhere
+#usr/share/java/standard.jar usr/share/i2p/lib/standard.jar
+
+
+# comment out if not building with libjstl1.1-java
+# ubuntu and debian: everywhere
+#usr/share/java/jstl1.1.jar usr/share/i2p/lib/jstl.jar
+
+
+# comment out if not building with gettext-base
+# ubuntu and debian: everywhere
+usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
+
+
+# comment out if not building with libgetopt-java
+# ubuntu and debian: everywhere
+usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
+
+
+# comment out if not building with libhttpclient-java and libhttpcore-java
+# 2 MB of dependencies vs. 20 KB of copied source
+# Requires 4.4 or higher.
+# Debian: Not in wheezy/jessie
+# Ubuntu: Only in wily and later
+#usr/share/java/httpclient.jar usr/share/i2p/lib/httpclient.jar
+#usr/share/java/httpcore.jar usr/share/i2p/lib/httpcore.jar
diff --git a/debian-alt/jessie/rules b/debian-alt/jessie/rules
new file mode 100755
index 000000000..9fadb6a2b
--- /dev/null
+++ b/debian-alt/jessie/rules
@@ -0,0 +1,205 @@
+#!/usr/bin/make -f
+
+# Quoting Policy version 3.9.2.0, 2011-04-07 section 4.9:
+
+# /start quote
+# For some packages, notably ones where the same source tree is compiled in
+# different ways to produce two binary packages, the build target does not make
+# much sense. For these packages it is good enough to provide two (or more)
+# targets (build-a and build-b or whatever) for each of the ways of building the
+# package, and a build target that does nothing. The binary target will have to
+# build the package in each of the possible ways and make the binary package out
+# of each.
+# ...
+# When a package has a configuration and build routine which takes a long time,
+# or when the makefiles are poorly designed, or when build needs to run clean
+# first, it is a good idea to touch build when the build process is complete.
+# This will ensure that if debian/rules build is run again it will not rebuild
+# the whole program.
+# /end quote
+
+# Since that fits building I2P very well, we override the build target.
+#
+
+build:
+	@echo 'The build target is disabled. Use the appropriate binary target.'
+
+JAVA_HOME=/usr/lib/jvm/default-java
+I2P=$(CURDIR)/pkg-temp
+ROUTERVERSION=$(CURDIR)/router/java/src/net/i2p/router/RouterVersion.java
+export DEB_BUILD_HARDENING=1
+
+# I2P's version will be displayed in the router console as "$I2PVERSION-$EXTRAPREFIX$DEBIANVERSION", eg. 0.8.12-0-deb1
+#export EXTRAPREFIX := deb
+export JAVA_HOME I2P
+export DEBIANVERSION := $(shell dpkg-parsechangelog |awk -F' ' '/^Version:/{print $$2}' |sed 's/.*-\([.0-9A-Za-z~+]\{1,\}\)$$/\1/')
+# required for jbigi/jcpuid build
+export BITS := $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
+#export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+
+%:
+	dh $@ --with systemd,quilt,bash-completion
+
+clean: createcopyright
+
+override_dh_auto_clean:
+	-[ -r $(CURDIR)/debian/routerversion.java.bak ] && mv -f $(CURDIR)/debian/routerversion.java.bak $(ROUTERVERSION)
+	dh_auto_clean
+	ant distclean
+	find $(CURDIR)/core \( -name '*\.so' -o -name '*\.o' \) -exec rm -f {} \;
+	rm -rf $(CURDIR)/core/c/jcpuid/lib/
+	rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
+	rm -rf $(CURDIR)/debian/python-i2p
+	rm -f $(CURDIR)/override.properties
+	debconf-updatepo
+
+override_dh_auto_build:
+
+override_dh_systemd_enable:
+	# We purposely do not set I2P to start at boot.
+	# This matches the behavior of the initscript
+	# and the setting RUN_DAEMON=false in /etc/default/i2p
+
+binary-indep: build-indep
+build-indep:
+	dh_prep
+	mkdir -p $(CURDIR)/installer/lib/wrapper/all
+	ln -sf /usr/share/java/wrapper.jar $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
+	if [ ! -e $(CURDIR)/debian/routerversion.java.bak ]; then \
+		cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \
+	fi
+ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
+	sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
+	mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
+else
+	@echo "Already found deb in version, not doing anything"
+endif
+	@# build options
+	@/bin/echo -e "javac.version=1.7" > $(CURDIR)/override.properties
+	@/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
+	@/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
+	@/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
+
+	@# debian and ubuntu: everywhere
+	@/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
+
+	@# 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
+	@#ln -sf /usr/share/java/jetty9-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
+	@#ln -sf /usr/share/java/jetty9-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
+	@#ln -sf /usr/share/java/jetty9-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
+	@#ln -sf /usr/share/java/jetty9-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
+	@#ln -sf /usr/share/java/jetty9-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
+	@#ln -sf /usr/share/java/jetty9-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
+	@#ln -sf /usr/share/java/jetty9-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
+	@#ln -sf /usr/share/java/jetty9-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
+	@#ln -sf /usr/share/java/jetty9-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
+	@#ln -sf /usr/share/java/jetty9-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
+	@#ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
+	@#ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
+	@#ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
+	@# following two are from libservlet3.1-java which is a dependency of libjetty9-java
+	@#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
+	@#ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
+	ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
+
+	@# debian and ubuntu: everywhere
+	@#/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties
+	@#ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
+
+	@# debian and ubuntu: everywhere
+	@#/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties
+	@#ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
+
+	@# debian and ubuntu: everywhere
+	@/bin/echo -e "with-gettext-base=true" >> $(CURDIR)/override.properties
+	@mkdir -p $(CURDIR)/core/java/build
+	ln -sf /usr/share/java/libintl.jar $(CURDIR)/core/java/build/libintl.jar
+
+	@# debian and ubuntu: everywhere
+	@/bin/echo -e "with-libgetopt-java=true" >> $(CURDIR)/override.properties
+	@mkdir -p $(CURDIR)/core/java/build
+	ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
+
+	@# 2 MB of dependencies vs. 20 KB of copied source
+	@# Requires 4.4 or higher.
+	@# Debian: Not in wheezy/jessie
+	@# Ubuntu: Only in wily and later
+	@#/bin/echo -e "with-libhttpclient-java=true" >> $(CURDIR)/override.properties
+	@#mkdir -p $(CURDIR)/core/java/build
+	@#ln -sf /usr/share/java/httpclient.jar $(CURDIR)/core/java/build/httpclient.jar
+	@#ln -sf /usr/share/java/httpcore.jar $(CURDIR)/core/java/build/httpcore.jar
+
+	TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
+	echo router.updateDisabled=true > $(I2P)/router.config
+	mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper
+
+binary-arch: build-arch
+build-arch:
+	# build jbigi
+	cd $(CURDIR)/core/c/jbigi && ./build_jbigi.sh dynamic
+	# build jcpuid
+	cd $(CURDIR)/core/c/jcpuid && ./build.sh
+
+binary: binary-arch binary-indep
+
+createcopyright:
+	@echo " *** Creating debian/copyright*** "
+	@rm -f $(CURDIR)/debian/copyright
+	@/bin/echo -e "This package was Debianized by kytv <killyourtv@i2pmail.org>" >> $(CURDIR)/debian/copyright
+	@/bin/echo -e "Sun, 23 Jan 2011 20:26:51 +0000" >> $(CURDIR)/debian/copyright
+	@/bin/echo -e "\nIt was downloaded from https://geti2p.net" >> $(CURDIR)/debian/copyright
+	@/bin/echo -e "\nI2P is tracked upstream using the Monotone VCS" >> $(CURDIR)/debian/copyright
+	@/bin/echo -e "Complete information on fetching the source with monotone can be found" >> $(CURDIR)/debian/copyright
+	@/bin/echo -e "at https://geti2p.net/newdevelopers#getting-the-i2p-code\n\n\n" >> $(CURDIR)/debian/copyright
+	@/bin/cat $(CURDIR)/LICENSE.txt >> $(CURDIR)/debian/copyright
+	@/bin/echo -e "\n\n The debian packaging has been released into the public domain." >> $(CURDIR)/debian/copyright
+
+override_dh_compress:
+	dh_compress -X.xsl -X.xml
+
+override_dh_install:
+	dh_install --list-missing
+	dh_apparmor --profile-name=system_i2p -pi2p
+	dh_apparmor --profile-name=usr.bin.i2prouter -pi2p
+
+override_dh_installchangelogs:
+	dh_installchangelogs history.txt
+
+override_dh_installdocs:
+	dh_installdocs -pi2p -plibjbigi-jni --link-doc=i2p-router
+	dh_installdocs --remaining-packages
+
+override_dh_dhlibdeps:
+	dh_shlibdeps -llibjbigi-jni debian/libjbigi-jni/usr/lib/jni/*.so
+
+#override_dh_installinit:
+#	dh_installinit -r
+
+override_dh_builddeb:
+	dh_builddeb -- -Zxz
+
+get-orig-source:
+	uscan --verbose --rename --destdir $(CURDIR)/.. --watchfile debian/watch --force-download
diff --git a/debian-alt/precise/control b/debian-alt/precise/control
index ee3f8a3d7..49b3639ba 100644
--- a/debian-alt/precise/control
+++ b/debian-alt/precise/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
 # Ant requires java 6 tools.jar:
@@ -76,7 +75,6 @@ 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,
  geoip-database,
  gettext-base,
  libgetopt-java,
diff --git a/debian-alt/precise/i2p-router.install b/debian-alt/precise/i2p-router.install
index 2234bf8cd..945bfe3b2 100644
--- a/debian-alt/precise/i2p-router.install
+++ b/debian-alt/precise/i2p-router.install
@@ -19,6 +19,7 @@ pkg-temp/systray.config usr/share/i2p
 pkg-temp/webapps usr/share/i2p
 
 
+pkg-temp/lib/addressbook.jar usr/share/i2p/lib
 pkg-temp/lib/BOB.jar usr/share/i2p/lib
 pkg-temp/lib/desktopgui.jar usr/share/i2p/lib
 pkg-temp/lib/i2p.jar usr/share/i2p/lib
@@ -34,7 +35,7 @@ pkg-temp/lib/streaming.jar usr/share/i2p/lib
 pkg-temp/lib/systray.jar usr/share/i2p/lib
 
 
-# uncomment if not building with libjetty8-java
+# uncomment if not building with libjetty9-java
 # ubuntu: in trusty vivid wily xenial
 # debian: in wheezy jessie stretch sid
 pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib
@@ -51,15 +52,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 libjetty8-java
-pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
 
 
-# uncomment if not building with either libtomcat6-java or libtomcat7-java
+# 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/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 e3aa80d78..f89ae3bd7 100644
--- a/debian-alt/precise/i2p-router.links
+++ b/debian-alt/precise/i2p-router.links
@@ -3,67 +3,51 @@ 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 libjetty8-java
+# comment out if not building with libjetty9-java
 # ubuntu: in trusty vivid wily xenial
 # debian: in wheezy jessie stretch sid
-#usr/share/java/jetty8-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
-#usr/share/java/jetty8-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
-#usr/share/java/jetty8-http.jar usr/share/i2p/lib/jetty-http.jar
-#usr/share/java/jetty8-io.jar usr/share/i2p/lib/jetty-io.jar
+#usr/share/java/jetty9-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
+#usr/share/java/jetty9-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
+#usr/share/java/jetty9-http.jar usr/share/i2p/lib/jetty-http.jar
+#usr/share/java/jetty9-io.jar usr/share/i2p/lib/jetty-io.jar
 # legacy name in lib/
-#usr/share/java/jetty8-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
-#usr/share/java/jetty8-security.jar usr/share/i2p/lib/jetty-security.jar
-#usr/share/java/jetty8-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
-#usr/share/java/jetty8-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
-#usr/share/java/jetty8-start.jar usr/share/i2p/lib/jetty-start.jar
-#usr/share/java/jetty8-util.jar usr/share/i2p/lib/jetty-util.jar
-#usr/share/java/jetty8-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
-#usr/share/java/jetty8-xml.jar usr/share/i2p/lib/jetty-xml.jar
+#usr/share/java/jetty9-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
+#usr/share/java/jetty9-security.jar usr/share/i2p/lib/jetty-security.jar
+#usr/share/java/jetty9-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
+#usr/share/java/jetty9-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
+#usr/share/java/jetty9-start.jar usr/share/i2p/lib/jetty-start.jar
+#usr/share/java/jetty9-util.jar usr/share/i2p/lib/jetty-util.jar
+#usr/share/java/jetty9-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
+#usr/share/java/jetty9-xml.jar usr/share/i2p/lib/jetty-xml.jar
 # legacy name in lib/
-#usr/share/java/jetty8-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
+#usr/share/java/jetty9-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
 # legacy name in lib/
-#usr/share/java/jetty8-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
-# following two are from libservlet3.0-java which is a dependency of libjetty8-java
+#usr/share/java/jetty9-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
+# following two are from libservlet3.1-java which is a dependency of libjetty9-java
 # legacy name in lib/
-#usr/share/java/servlet-api-3.0.jar usr/share/i2p/lib/javax.servlet.jar
+#usr/share/java/servlet-api-3.1.jar usr/share/i2p/lib/javax.servlet.jar
 # combined into javax.servlet.jar in non-package builds
-#usr/share/java/jsp-api-2.2.jar usr/share/i2p/lib/jsp-api.jar
+#usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar
 
 
-# comment out if not building with libtomcat6-java
-# ubuntu: only in precise trusty vivid
-# debian: only in wheezy
+# 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/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
-#usr/share/java/jasper.jar usr/share/i2p/lib/jasper-runtime.jar
+#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/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
+#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/jasper-el.jar usr/share/i2p/lib/jasper-el.jar
-# following is from libservlet2.5-java which is a dependency of libtomcat6-java
+#usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
 # legacy name in lib/
-#usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
-
-
-# comment out if not building with libtomcat7-java
-# ubuntu: only in precise trusty vivid
-# debian: only in wheezy
-# legacy name, contains only tomcat-juli, not commons-logging
-#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
-#usr/share/java/tomcat-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
-# combined into jasper-runtime.jar in non-package builds
-#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
-# tomcat 7 only
-#usr/share/java/tomcat-api.jar usr/share/i2p/lib/tomcat-api.jar
-#usr/share/java/tomcat-util.jar usr/share/i2p/lib/tomcat-util.jar
-# combined into commons-el.jar in non-package builds
-#usr/share/java/tomcat-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
-# following is from libservlet3.0-java which is a dependency of libtomcat7-java
-# legacy name in lib/
-#usr/share/java/el-api-2.2.jar usr/share/i2p/lib/commons-el.jar
+#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
diff --git a/debian-alt/precise/rules b/debian-alt/precise/rules
index 4afb56418..3962457e5 100755
--- a/debian-alt/precise/rules
+++ b/debian-alt/precise/rules
@@ -39,7 +39,7 @@ export BITS := $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 #export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 %:
-	dh $@
+	dh $@ --with bash-completion
 
 clean: createcopyright
 
@@ -84,50 +84,41 @@ 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
-	@#/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
+	@# 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/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
-	@#ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
-	@#ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
-	@#ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
-	@#ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
-	@#ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
-	@#ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
-	@#ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
-	@#ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
-	@#ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
-	@#ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
-	@#ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
-	@#ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
-	@#ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
-	@# following two are from libservlet3.0-java which is a dependency of libjetty8-java
-	@#ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
-	@#ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
+	@#ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
+	@#ln -sf /usr/share/java/jetty9-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
+	@#ln -sf /usr/share/java/jetty9-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
+	@#ln -sf /usr/share/java/jetty9-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
+	@#ln -sf /usr/share/java/jetty9-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
+	@#ln -sf /usr/share/java/jetty9-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
+	@#ln -sf /usr/share/java/jetty9-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
+	@#ln -sf /usr/share/java/jetty9-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
+	@#ln -sf /usr/share/java/jetty9-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
+	@#ln -sf /usr/share/java/jetty9-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
+	@#ln -sf /usr/share/java/jetty9-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
+	@#ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
+	@#ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
+	@#ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
+	@# following two are from libservlet3.1-java which is a dependency of libjetty9-java
+	@#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
 
-	@# ubuntu: only in precise trusty vivid
-	@# debian: only in wheezy
-	@#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
+	@# 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/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
-	@#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
-	@#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
-	@#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
-	@# following is from libservlet2.5-java which is a dependency of libtomcat6-java
-	@#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
-
-	@# debian and ubuntu: everywhere
-	@#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
-	@#mkdir -p $(CURDIR)/apps/jetty/jettylib
-	@#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
-	@#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
-	@#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
-	@#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
-	@#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
-	@#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
-	@# following is from libservlet3.0-java which is a dependency of libtomcat7-java
-	@#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.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-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
diff --git a/debian-alt/trusty/control b/debian-alt/trusty/control
new file mode 100644
index 000000000..75a2dbd89
--- /dev/null
+++ b/debian-alt/trusty/control
@@ -0,0 +1,109 @@
+Source: i2p
+Maintainer: zzz <zzz@i2pmail.org>
+Section: net
+Standards-Version: 3.9.6
+Priority: optional
+Bugs: mailto:zzz@i2pmail.org
+Homepage: https://geti2p.net/
+Build-Depends: debhelper (>= 7.0.50~)
+ ,ant (>= 1.8)
+ ,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
+ ,glassfish-javaee
+ ,dh-apparmor
+ ,gettext
+ ,libgetopt-java
+ ,libgmp-dev (>= 2:5.0.2)
+ ,libservice-wrapper-java
+ ,hardening-wrapper
+ ,po-debconf
+
+Package: i2p
+Architecture: all
+Section: net
+Priority: optional
+Depends: ${java:Depends}, ${shlibs:Depends},
+ adduser,
+ debconf,
+ i2p-router (>= 0.8.6-5),
+ libjbigi-jni,
+ lsb-base,
+ service-wrapper
+Description: I2P anonymous network
+ I2P is an anonymizing network, offering a simple layer that identity-sensitive
+ applications can use to securely communicate. All data is wrapped with several
+ layers of encryption, and the network is both distributed and dynamic, with no
+ trusted parties.
+ .
+ This package depends on the router, jbigi, the java service wrapper, and
+ includes support to run I2P as a daemon.
+
+Package: libjbigi-jni
+Architecture: any
+Section: java
+Priority: optional
+Depends: ${shlibs:Depends}, i2p-router
+Homepage: https://geti2p.net/
+Description: I2P libjbigi library
+ This Package contains the libjbigi JNI library (and on x86 platforms, jcpuid).
+ .
+ libjbigi is a math library that is part of the I2P installation.  Use of this
+ library greatly enhances the efficiency of cryptographic algorithms, such as
+ the ones used by I2P. You can expect to see a 5-7x speed improvement on certain
+ tasks, such as elGamal encryption/decryption.
+
+Package: i2p-doc
+Architecture: all
+Section: doc
+Priority: extra
+Depends: ${misc:Depends}
+Suggests: i2p, default-jdk-doc
+Description: I2P developer documentation
+ I2P is an anonymizing network, offering a simple layer that identity-sensitive
+ applications can use to securely communicate. All data is wrapped with several
+ layers of encryption, and the network is both distributed and dynamic, with no
+ trusted parties.
+ .
+ This package contains the Javadoc files.
+
+Package: i2p-router
+Architecture: all
+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,
+ glassfish-javaee,
+ geoip-database,
+ gettext-base,
+ libgetopt-java,
+Replaces: i2p ( << 0.8.6-5)
+Breaks: i2p (<< 0.8.6-5)
+Recommends: libjbigi-jni, ttf-dejavu
+Suggests: tor
+ ,apparmor
+ ,i2p-messenger
+ ,i2phex
+ ,i2p-tahoe-lafs
+ ,imule
+ ,irc-client
+ ,itoopie
+ ,mail-client
+ ,mail-reader
+ ,news-reader
+ ,polipo
+ ,privoxy
+ ,robert
+ ,syndie
+ ,www-browser
+ ,xul-ext-torbutton
+Description: I2P router
+ I2P is an anonymizing network, offering a simple layer that identity-sensitive
+ applications can use to securely communicate. All data is wrapped with several
+ layers of encryption, and the network is both distributed and dynamic, with no
+ trusted parties.
+ .
+ TrueType fonts (such as those provided in the package ttf-dejavu) are required
+ in order to generate graphs.
diff --git a/debian-alt/trusty/i2p-router.install b/debian-alt/trusty/i2p-router.install
new file mode 100644
index 000000000..945bfe3b2
--- /dev/null
+++ b/debian-alt/trusty/i2p-router.install
@@ -0,0 +1,73 @@
+# history.txt is installed to /usr/share/i2p because
+# it's shown in the router console at http://127.0.0.1:7657
+# (this is also why I don't use dh_installchangelogs -k for it)
+history.txt usr/share/i2p
+
+pkg-temp/blocklist.txt usr/share/i2p
+pkg-temp/certificates usr/share/i2p
+pkg-temp/clients.config usr/share/i2p
+pkg-temp/docs usr/share/i2p/
+pkg-temp/eepget usr/bin
+pkg-temp/eepsite usr/share/i2p
+pkg-temp/geoip usr/share/i2p
+pkg-temp/hosts.txt usr/share/i2p
+pkg-temp/i2prouter-nowrapper usr/bin
+pkg-temp/i2psnark.config usr/share/i2p
+pkg-temp/i2ptunnel.config usr/share/i2p
+pkg-temp/router.config usr/share/i2p
+pkg-temp/systray.config usr/share/i2p
+pkg-temp/webapps usr/share/i2p
+
+
+pkg-temp/lib/addressbook.jar usr/share/i2p/lib
+pkg-temp/lib/BOB.jar usr/share/i2p/lib
+pkg-temp/lib/desktopgui.jar usr/share/i2p/lib
+pkg-temp/lib/i2p.jar usr/share/i2p/lib
+pkg-temp/lib/i2psnark.jar usr/share/i2p/lib
+pkg-temp/lib/i2ptunnel.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-i2p.jar usr/share/i2p/lib
+pkg-temp/lib/jrobin.jar usr/share/i2p/lib
+pkg-temp/lib/mstreaming.jar usr/share/i2p/lib
+pkg-temp/lib/routerconsole.jar usr/share/i2p/lib
+pkg-temp/lib/router.jar usr/share/i2p/lib
+pkg-temp/lib/sam.jar usr/share/i2p/lib
+pkg-temp/lib/streaming.jar usr/share/i2p/lib
+pkg-temp/lib/systray.jar usr/share/i2p/lib
+
+
+# uncomment if not building with libjetty9-java
+# ubuntu: in trusty vivid wily xenial
+# debian: in wheezy jessie stretch sid
+pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-deploy.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-http.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-io.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-security.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-servlet.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-servlets.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-start.jar usr/share/i2p/lib
+pkg-temp/lib/jetty-util.jar usr/share/i2p/lib
+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
+
+
+# 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/javax.servlet.jar usr/share/i2p/lib
+
+
+# uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java
+# ubuntu and debian: everywhere
+# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
+pkg-temp/lib/jstl.jar usr/share/i2p/lib
+
+
+# uncomment if not building with either glassfish-javaee or libjstl1.1-java
+# ubuntu and debian: everywhere
+#pkg-temp/lib/standard.jar usr/share/i2p/lib
diff --git a/debian-alt/trusty/i2p-router.links b/debian-alt/trusty/i2p-router.links
new file mode 100644
index 000000000..f89ae3bd7
--- /dev/null
+++ b/debian-alt/trusty/i2p-router.links
@@ -0,0 +1,85 @@
+usr/share/common-licenses/GPL-2 usr/share/doc/i2p-router/licenses/LICENSE-GPLv2.txt
+usr/share/common-licenses/LGPL-2.1 usr/share/doc/i2p-router/licenses/LICENSE-LGPLv2.1.txt
+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
+
+
+# comment out if not building with libjetty9-java
+# ubuntu: in trusty vivid wily xenial
+# debian: in wheezy jessie stretch sid
+#usr/share/java/jetty9-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
+#usr/share/java/jetty9-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
+#usr/share/java/jetty9-http.jar usr/share/i2p/lib/jetty-http.jar
+#usr/share/java/jetty9-io.jar usr/share/i2p/lib/jetty-io.jar
+# legacy name in lib/
+#usr/share/java/jetty9-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
+#usr/share/java/jetty9-security.jar usr/share/i2p/lib/jetty-security.jar
+#usr/share/java/jetty9-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
+#usr/share/java/jetty9-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
+#usr/share/java/jetty9-start.jar usr/share/i2p/lib/jetty-start.jar
+#usr/share/java/jetty9-util.jar usr/share/i2p/lib/jetty-util.jar
+#usr/share/java/jetty9-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
+#usr/share/java/jetty9-xml.jar usr/share/i2p/lib/jetty-xml.jar
+# legacy name in lib/
+#usr/share/java/jetty9-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
+# legacy name in lib/
+#usr/share/java/jetty9-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
+# following two are from libservlet3.1-java which is a dependency of libjetty9-java
+# legacy name in lib/
+#usr/share/java/servlet-api-3.1.jar usr/share/i2p/lib/javax.servlet.jar
+# combined into javax.servlet.jar in non-package builds
+#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
+usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar
+
+
+# comment out if not building with libjakarta-taglibs-standard-java
+# ubuntu and debian: everywhere
+#usr/share/java/standard.jar usr/share/i2p/lib/standard.jar
+
+
+# comment out if not building with libjstl1.1-java
+# ubuntu and debian: everywhere
+#usr/share/java/jstl1.1.jar usr/share/i2p/lib/jstl.jar
+
+
+# comment out if not building with gettext-base
+# ubuntu and debian: everywhere
+usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
+
+
+# comment out if not building with libgetopt-java
+# ubuntu and debian: everywhere
+usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
+
+
+# comment out if not building with libhttpclient-java and libhttpcore-java
+# 2 MB of dependencies vs. 20 KB of copied source
+# Requires 4.4 or higher.
+# Debian: Not in wheezy/jessie
+# Ubuntu: Only in wily and later
+#usr/share/java/httpclient.jar usr/share/i2p/lib/httpclient.jar
+#usr/share/java/httpcore.jar usr/share/i2p/lib/httpcore.jar
diff --git a/debian-alt/trusty/rules b/debian-alt/trusty/rules
index 257162006..e33ce31f4 100755
--- a/debian-alt/trusty/rules
+++ b/debian-alt/trusty/rules
@@ -38,7 +38,7 @@ export BITS := $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 #export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 %:
-	dh $@ --with systemd
+	dh $@ --with systemd,bash-completion
 
 clean: createcopyright
 
@@ -83,50 +83,41 @@ 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
-	@/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
-	mkdir -p $(CURDIR)/apps/jetty/jettylib
-	ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
-	ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
-	ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
-	ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
-	ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
-	ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
-	ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
-	ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
-	ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
-	ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
-	ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
-	ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
-	ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
-	ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
-	@# following two are from libservlet3.0-java which is a dependency of libjetty8-java
-	ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
-	ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
-
-	@# ubuntu: only in precise trusty vivid
-	@# debian: only in wheezy
-	@#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
+	@# 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/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
-	@#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
-	@#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
-	@#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
-	@# following is from libservlet2.5-java which is a dependency of libtomcat6-java
-	@#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
+	@#ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
+	@#ln -sf /usr/share/java/jetty9-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
+	@#ln -sf /usr/share/java/jetty9-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
+	@#ln -sf /usr/share/java/jetty9-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
+	@#ln -sf /usr/share/java/jetty9-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
+	@#ln -sf /usr/share/java/jetty9-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
+	@#ln -sf /usr/share/java/jetty9-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
+	@#ln -sf /usr/share/java/jetty9-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
+	@#ln -sf /usr/share/java/jetty9-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
+	@#ln -sf /usr/share/java/jetty9-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
+	@#ln -sf /usr/share/java/jetty9-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
+	@#ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
+	@#ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
+	@#ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
+	@# following two are from libservlet3.1-java which is a dependency of libjetty9-java
+	@#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: everywhere
-	@#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
+	@# 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/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
-	@#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
-	@#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
-	@#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
-	@#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
-	@#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
-	@# following is from libservlet3.0-java which is a dependency of libtomcat7-java
-	@#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.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-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
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/wheezy/rules b/debian-alt/wheezy/rules
index 61b5ac37f..b96fecdd1 100755
--- a/debian-alt/wheezy/rules
+++ b/debian-alt/wheezy/rules
@@ -36,7 +36,7 @@ export DEBIANVERSION := $(shell dpkg-parsechangelog |awk -F' ' '/^Version:/{prin
 #export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 %:
-	dh $@ --with systemd
+	dh $@ --with systemd,bash-completion
 
 clean: createcopyright
 
diff --git a/debian-alt/xenial/control b/debian-alt/xenial/control
index 7b55ca967..3fe552d46 100644
--- a/debian-alt/xenial/control
+++ b/debian-alt/xenial/control
@@ -7,10 +7,11 @@ 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
  ,glassfish-javaee
+ ,libtomcat8-java
  ,dh-apparmor
  ,gettext
  ,libgetopt-java
@@ -73,11 +74,12 @@ Section: net
 Priority: optional
 Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  openjdk-8-jre-headless | java8-runtime-headless,
- libecj-java,
+ libjetty9-java,
+ glassfish-javaee,
+ 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/rules b/debian-alt/xenial/rules
index 4e87fc72b..9734f3442 100755
--- a/debian-alt/xenial/rules
+++ b/debian-alt/xenial/rules
@@ -38,7 +38,7 @@ export BITS := $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 #export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 %:
-	dh $@ --with systemd
+	dh $@ --with systemd,bash-completion
 
 clean: createcopyright
 
@@ -83,50 +83,40 @@ 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
-	@/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
+	@# 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/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
-	ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
-	ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
-	ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
-	ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
-	ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
-	ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
-	ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
-	ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
-	ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
-	ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
-	ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
-	ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
-	ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
-	@# following two are from libservlet3.0-java which is a dependency of libjetty8-java
-	ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
-	ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
+	ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
+	ln -sf /usr/share/java/jetty9-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
+	ln -sf /usr/share/java/jetty9-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
+	ln -sf /usr/share/java/jetty9-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
+	ln -sf /usr/share/java/jetty9-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
+	ln -sf /usr/share/java/jetty9-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
+	ln -sf /usr/share/java/jetty9-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
+	ln -sf /usr/share/java/jetty9-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
+	ln -sf /usr/share/java/jetty9-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
+	ln -sf /usr/share/java/jetty9-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
+	ln -sf /usr/share/java/jetty9-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
+	ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
+	ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
+	ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
+	@# following two are from libservlet3.1-java which is a dependency of libjetty9-java
+	ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
+	@# this is roughly the same as tomcat8-jsp-api.jar, we use this one
+	ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
 
-	@# ubuntu: only in precise trusty vivid
-	@# debian: only in wheezy
-	@#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
-	@#mkdir -p $(CURDIR)/apps/jetty/jettylib
-	@#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
-	@#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
-	@#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
-	@#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
-	@# following is from libservlet2.5-java which is a dependency of libtomcat6-java
-	@#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
-
-	@# debian and ubuntu: everywhere
-	@#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
-	@#mkdir -p $(CURDIR)/apps/jetty/jettylib
-	@#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
-	@#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
-	@#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
-	@#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
-	@#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
-	@#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
-	@# following is from libservlet3.0-java which is a dependency of libtomcat7-java
-	@#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.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-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
 
 	@# debian and ubuntu: everywhere
 	@/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
diff --git a/debian/control b/debian/control
index 7a9a12c20..d66594865 100644
--- a/debian/control
+++ b/debian/control
@@ -7,11 +7,11 @@ Bugs: mailto:zzz@i2pmail.org
 Homepage: https://geti2p.net/
 Build-Depends: debhelper (>= 7.0.50~)
  ,ant (>= 1.8)
- ,ant-optional
  ,debconf
  ,openjdk-7-jdk
- ,libjetty8-java, libservlet3.0-java
+ ,libjetty9-java
  ,glassfish-javaee
+ ,libtomcat8-java
  ,dh-apparmor
  ,gettext
  ,libgetopt-java
@@ -79,8 +79,9 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  geoip-database,
  gettext-base,
  libgetopt-java,
- libjetty8-java, libservlet3.0-java,
- glassfish-javaee
+ libjetty9-java,
+ glassfish-javaee,
+ libtomcat8-java
 Replaces: i2p ( << 0.8.6-5)
 Breaks: i2p (<< 0.8.6-5)
 Recommends: libjbigi-jni, ttf-dejavu
diff --git a/debian/i2p-router.bash-completion b/debian/i2p-router.bash-completion
new file mode 100644
index 000000000..bfb55196f
--- /dev/null
+++ b/debian/i2p-router.bash-completion
@@ -0,0 +1 @@
+installer/resources/bash-completion/eepget
diff --git a/debian/i2p-router.install b/debian/i2p-router.install
index a61b4e834..a3be0e314 100644
--- a/debian/i2p-router.install
+++ b/debian/i2p-router.install
@@ -19,6 +19,7 @@ pkg-temp/systray.config usr/share/i2p
 pkg-temp/webapps usr/share/i2p
 
 
+pkg-temp/lib/addressbook.jar usr/share/i2p/lib
 pkg-temp/lib/BOB.jar usr/share/i2p/lib
 pkg-temp/lib/desktopgui.jar usr/share/i2p/lib
 pkg-temp/lib/i2p.jar usr/share/i2p/lib
@@ -34,7 +35,7 @@ pkg-temp/lib/streaming.jar usr/share/i2p/lib
 pkg-temp/lib/systray.jar usr/share/i2p/lib
 
 
-# uncomment if not building with libjetty8-java
+# uncomment if not building with libjetty9-java
 # ubuntu: in trusty vivid wily xenial
 # debian: in wheezy jessie stretch sid
 #pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib
@@ -51,15 +52,15 @@ pkg-temp/lib/systray.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 libjetty8-java
+# 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 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
 
 
 # uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java
diff --git a/debian/i2p-router.links b/debian/i2p-router.links
index e32b48b49..5fd470ffa 100644
--- a/debian/i2p-router.links
+++ b/debian/i2p-router.links
@@ -6,81 +6,49 @@ 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 libjetty8-java
+# comment out if not building with libjetty9-java
 # ubuntu: in trusty vivid wily xenial
 # debian: in wheezy jessie stretch sid
-usr/share/java/jetty8-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
-usr/share/java/jetty8-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
-usr/share/java/jetty8-http.jar usr/share/i2p/lib/jetty-http.jar
-usr/share/java/jetty8-io.jar usr/share/i2p/lib/jetty-io.jar
+usr/share/java/jetty9-apache-jsp.jar usr/share/i2p/lib/jetty-apache-jsp.jar
+usr/share/java/jetty9-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
+usr/share/java/jetty9-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
+usr/share/java/jetty9-http.jar usr/share/i2p/lib/jetty-http.jar
+usr/share/java/jetty9-io.jar usr/share/i2p/lib/jetty-io.jar
 # legacy name in lib/
-usr/share/java/jetty8-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
-usr/share/java/jetty8-security.jar usr/share/i2p/lib/jetty-security.jar
-usr/share/java/jetty8-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
-usr/share/java/jetty8-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
-usr/share/java/jetty8-start.jar usr/share/i2p/lib/jetty-start.jar
-usr/share/java/jetty8-util.jar usr/share/i2p/lib/jetty-util.jar
-usr/share/java/jetty8-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
-usr/share/java/jetty8-xml.jar usr/share/i2p/lib/jetty-xml.jar
+usr/share/java/jetty9-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
+usr/share/java/jetty9-security.jar usr/share/i2p/lib/jetty-security.jar
+usr/share/java/jetty9-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
+usr/share/java/jetty9-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
+usr/share/java/jetty9-start.jar usr/share/i2p/lib/jetty-start.jar
+usr/share/java/jetty9-util.jar usr/share/i2p/lib/jetty-util.jar
+usr/share/java/jetty9-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
+usr/share/java/jetty9-xml.jar usr/share/i2p/lib/jetty-xml.jar
 # legacy name in lib/
-usr/share/java/jetty8-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
+usr/share/java/jetty9-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
 # legacy name in lib/
-usr/share/java/jetty8-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
-# following two are from libservlet3.0-java which is a dependency of libjetty8-java
+usr/share/java/jetty9-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
+# following two are from libservlet3.1-java which is a dependency of libjetty9-java
 # legacy name in lib/
-usr/share/java/servlet-api-3.0.jar usr/share/i2p/lib/javax.servlet.jar
+usr/share/java/servlet-api-3.1.jar usr/share/i2p/lib/javax.servlet.jar
 # combined into javax.servlet.jar in non-package builds
-usr/share/java/jsp-api-2.2.jar usr/share/i2p/lib/jsp-api.jar
-
-
-# comment out if not building with libtomcat6-java
-# ubuntu: only in precise trusty vivid
-# debian: only in wheezy
-# legacy name, contains only tomcat-juli, not commons-logging
-#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
-#usr/share/java/jasper.jar usr/share/i2p/lib/jasper-runtime.jar
-# combined into jasper-runtime.jar in non-package builds
-#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
-# combined into commons-el.jar in non-package builds
-#usr/share/java/jasper-el.jar usr/share/i2p/lib/jasper-el.jar
-# following is from libservlet2.5-java which is a dependency of libtomcat6-java
-# legacy name in lib/
-#usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
-
-
-# comment out if not building with libtomcat7-java
-# ubuntu: only in precise trusty vivid
-# debian: only in wheezy
-# legacy name, contains only tomcat-juli, not commons-logging
-#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
-#usr/share/java/tomcat-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
-# combined into jasper-runtime.jar in non-package builds
-#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
-# tomcat 7 only
-#usr/share/java/tomcat-api.jar usr/share/i2p/lib/tomcat-api.jar
-#usr/share/java/tomcat-util.jar usr/share/i2p/lib/tomcat-util.jar
-# combined into commons-el.jar in non-package builds
-#usr/share/java/tomcat-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
-# following is from libservlet3.0-java which is a dependency of libtomcat7-java
-# legacy name in lib/
-#usr/share/java/el-api-2.2.jar usr/share/i2p/lib/commons-el.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
+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
-# tomcat 7 only
-#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-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
+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-el-api.jar usr/share/i2p/lib/commons-el.jar
 
 
 # comment out if not building with glassfish-javaee
diff --git a/debian/i2p-router.manpages b/debian/i2p-router.manpages
index cf061d689..ca857c83c 100644
--- a/debian/i2p-router.manpages
+++ b/debian/i2p-router.manpages
@@ -6,5 +6,9 @@ installer/resources/man/eepget.fr.1
 installer/resources/man/eepget.it.1
 installer/resources/man/eepget.ko.1
 installer/resources/man/eepget.nl.1
+installer/resources/man/eepget.pl.1
 installer/resources/man/eepget.pt.1
+installer/resources/man/eepget.pt_BR.1
+installer/resources/man/eepget.ru.1
+installer/resources/man/eepget.sv.1
 installer/resources/man/eepget.zh.1
diff --git a/debian/i2p.bash-completion b/debian/i2p.bash-completion
new file mode 100644
index 000000000..d82584a60
--- /dev/null
+++ b/debian/i2p.bash-completion
@@ -0,0 +1,2 @@
+installer/resources/bash-completion/i2prouter
+installer/resources/bash-completion/i2prouter-nowrapper
diff --git a/debian/i2p.manpages b/debian/i2p.manpages
index 8488b90bc..c9a587862 100644
--- a/debian/i2p.manpages
+++ b/debian/i2p.manpages
@@ -6,7 +6,11 @@ installer/resources/man/i2prouter.fr.1
 installer/resources/man/i2prouter.it.1
 installer/resources/man/i2prouter.ko.1
 installer/resources/man/i2prouter.nl.1
+installer/resources/man/i2prouter.pl.1
 installer/resources/man/i2prouter.pt.1
+installer/resources/man/i2prouter.pt_BR.1
+installer/resources/man/i2prouter.ru.1
+installer/resources/man/i2prouter.sv.1
 installer/resources/man/i2prouter.zh.1
 installer/resources/man/i2prouter-nowrapper.1
 installer/resources/man/i2prouter-nowrapper.de.1
@@ -16,5 +20,9 @@ installer/resources/man/i2prouter-nowrapper.fr.1
 installer/resources/man/i2prouter-nowrapper.it.1
 installer/resources/man/i2prouter-nowrapper.ko.1
 installer/resources/man/i2prouter-nowrapper.nl.1
+installer/resources/man/i2prouter-nowrapper.pl.1
 installer/resources/man/i2prouter-nowrapper.pt.1
+installer/resources/man/i2prouter-nowrapper.pt_BR.1
+installer/resources/man/i2prouter-nowrapper.ru.1
+installer/resources/man/i2prouter-nowrapper.sv.1
 installer/resources/man/i2prouter-nowrapper.zh.1
diff --git a/debian/rules b/debian/rules
index a1277c451..5b8cc658c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ export BITS := $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 #export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 %:
-	dh $@ --with systemd,quilt
+	dh $@ --with systemd,quilt,bash-completion
 
 clean: createcopyright
 
@@ -83,61 +83,40 @@ 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
-	@/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
+	@# 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/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
-	ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
-	ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
-	ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
-	ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
-	ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
-	ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
-	ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
-	ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
-	ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
-	ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
-	ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
-	ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
-	ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
-	@# following two are from libservlet3.0-java which is a dependency of libjetty8-java
-	ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
-	ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
-
-	@# ubuntu: only in precise trusty vivid
-	@# debian: only in wheezy
-	@#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
-	@#mkdir -p $(CURDIR)/apps/jetty/jettylib
-	@#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
-	@#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
-	@#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
-	@#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
-	@# following is from libservlet2.5-java which is a dependency of libtomcat6-java
-	@#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
-
-	@# debian and ubuntu: everywhere
-	@#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
-	@#mkdir -p $(CURDIR)/apps/jetty/jettylib
-	@#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
-	@#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
-	@#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
-	@#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
-	@#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
-	@#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
-	@# following is from libservlet3.0-java which is a dependency of libtomcat7-java
-	@#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
+	ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
+	ln -sf /usr/share/java/jetty9-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
+	ln -sf /usr/share/java/jetty9-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
+	ln -sf /usr/share/java/jetty9-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
+	ln -sf /usr/share/java/jetty9-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
+	ln -sf /usr/share/java/jetty9-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
+	ln -sf /usr/share/java/jetty9-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
+	ln -sf /usr/share/java/jetty9-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
+	ln -sf /usr/share/java/jetty9-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
+	ln -sf /usr/share/java/jetty9-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
+	ln -sf /usr/share/java/jetty9-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
+	ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
+	ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
+	ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
+	@# following two are from libservlet3.1-java which is a dependency of libjetty9-java
+	ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
+	@# this is roughly the same as tomcat8-jsp-api.jar, we use this one
+	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-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-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.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
+	/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-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
 
 	@# debian and ubuntu: everywhere
 	@/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
diff --git a/history.txt b/history.txt
index 7cbfdac87..40cb88d7b 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,127 @@
+2017-04-02 zzz
+ * Context: Fix ClientAppManagerImpl in AppContext
+ * i2psnark: Fix standalone configuration for Jetty 9
+
+2017-04-01 zzz
+ * Console: Fix stopping of webapps when console stops (ticket #1893)
+ * i2psnark: Only rewrite torrent config file if changed (ticket #1893)
+ * KeyStoreUtil: Reduce log level of expired cert error
+ * Util: Don't sync config writes on Android/ARM (ticket #1893)
+
+2017-03-31 zzz
+ * SSU:
+   - When a IPv6 peer connects, trigger a IPv6 peer test, not a IPv4 one
+   - Require two consecutive peer test results for some state transitions,
+     to prevent frequent transitions to firewalled and back
+
+2017-03-29 zzz
+ * SSU: Refactor PeerTestEvent out of UDPTransport
+ * Throttle: Reduce threshold for probabalistic throttling
+   on slow platforms (ticket #1964)
+
+2017-03-27 zzz
+ * Blockfile: Include authentication strings in exports
+ * Build: Suppress JarScanner warning during Debian build (ticket #1975)
+ * Debian: Add missing addressbook.jar to package (ticket #1973)
+ * SusiDNS: Add addressbook.jar to classpath, don't fail
+   to start if it's still not found (ticket #1973)
+ * Time: Fix crashes on old Androids (ticket #1976)
+
+2017-03-25 zzz
+ * Blockfile: Upgrade to Blockfile format 4 on non-Android ARM
+ * i2ptunnel: Allow alt priv key file to be added without restarting I2P
+
+2017-03-24 zzz
+ * Addressbook: Remove static reference, hide implementation
+ * CPUID: Recognize Ryzen
+
+2017-03-23 zzz
+ * Plugins:
+   - Blacklist i2pbote and BwSchedule
+   - Translate exceptions thrown from PluginStarter
+   - Add version number to console messages when installing/starting
+
+2017-03-21 zzz
+ * i2psnark: Enhancement to support RPC plugin
+ * Context: New ClientAppManagerImpl in AppContext, so registration works
+
+2017-03-20 zzz
+ * i2psnark: Enhancements to support RPC plugin
+ * SSU: More work on introducer expiration (proposal 133)
+
+2017-03-18 zzz
+ * Addressbook (ticket #1966):
+   - Build as jar, not war
+   - Put empty war in updater
+   - Move Servlet starter to SusiDNS
+   - Skip war in RouterConsoleRunner
+
+2017-03-14 zzz
+ * Blockfile: Fix specified-destination deletion from the correct book
+ * i2ptunnel:
+   - New form to enter private key file for alternate destination
+   - Use alt destination for registration if set
+ * NBI: Adjust info logging at startup
+ * SusiDNS:
+   - New button for adding alternate destination
+   - Fix nonces on details page with multiple destinations
+   - Fix single dest deletion on details page with multiple destinations
+   - Set book in all forms to ensure correct book
+
+2017-03-13 zzz
+ * i2ptunnel:
+   - Add subsession support to servers
+   - Reset I2P socket on TCP socket errors
+ * SAM: Reset I2P socket on handler errors
+ * Streaming: Add reset() to I2PSocket API
+
+2017-03-11 zzz
+Prop from i2p.i2p.zzz.jetty9:
+ * Console: Fix RouterConsoleRunner for Jetty 9
+ * Debian packages:
+   - Remove libjetty8-java and ant-optional dependencies
+   - Add libjetty9-java and libtomcat8-java dependencies
+     Fixes stretch/sid package (ticket #1902)
+   - Fix up build files for package builds
+ * Eepsite: Update initial configuration files for Jetty 9
+ * Jetty:
+   - Update to Jetty 9.2.21.v20170120 and Tomcat 8.0.33 (tickets #1512, #1935)
+     Fixes jsp compilation on Java 9 (ticket #1870)
+     Fixes InstanceManager warning (ticket #1818)
+     We now support servlet API 3.1, JSP API 2.3, and EL API 3.0.
+     Breaks the following plugins: bwschedule, i2pbote, i2pcontrol, zzzot
+ * Startup: Add migration code for eepsite Jetty 8 configuration files
+
+2017-03-09 zzz
+ * i2psnark: Prevent RuntimeException caused by corrupt i2psnark.dht.dat file
+ * Router: Set default sig type to EdDSA for non-Android ARM
+ * Streaming: Don't change buffer size when max message size is adjusted
+
+2017-03-06 zzz
+ * CPUID:
+   - Fix saving of libjcpuid.jnifile on Macs,
+     was incorrectly saving as libjcpuid.so (tickets #1865, #1900)
+   - Try to load libjcpuid-x86_64-osx.jnilib for 32-bit Macs,
+     because as of 0.9.26 it's a 'fat binary' with 32-bit in it also.
+   - Add library search path logging to main()
+ * NBI:
+   - Try to load the "none" architecture for x86, even if
+     CPUID loading fails (tickets #1865, #1900)
+   - Add library search path logging to main()
+ * Throttle: Fix disable of probabalistic throttling
+   (ticket #1963) (thx mysterious)
+
+2017-03-03 zzz
+ * Utils: Fix crash in Windows installer
+
+2017-03-02 zzz
+ * SSU:
+   - Initial work on introducer expiration (proposal 133)
+   - Fix bug in error handling for introduction parameters in RI
+
+2017-03-01 zzz
+ * Servlet: Catch OOM in MultiPartRequest
+
 2017-02-27 zzz
  * i2psnark: Fix disappearing start button
  * addressbook: Add date parameter to authentication strings
diff --git a/installer/resources/bash-completion/eepget b/installer/resources/bash-completion/eepget
new file mode 100644
index 000000000..388c51d4b
--- /dev/null
+++ b/installer/resources/bash-completion/eepget
@@ -0,0 +1,55 @@
+_eepget() 
+{
+    local cur prev opts
+    _init_completion || return
+
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    opts="-c -e -h -l -m -n -o -p -t -u -x"
+
+    case "${prev}" in
+      -e|-h|-u|-x)
+        return
+        ;;
+      -l|-m|-t)
+        if [[ $cur == "" ]]; then
+            COMPREPLY=( $( compgen -P "$cur" -W "{1..9}" ) )
+        elif [[ $cur == "0" ]]; then
+            COMPREPLY=( $( compgen -W "$cur" ) )
+        else
+            COMPREPLY=( $( compgen -P "$cur" -W "{0..9}" ) )
+        fi
+        compopt -o nospace
+        return
+        ;;
+      -n)
+        if [[ $cur == "0" ]]; then
+            COMPREPLY=( $( compgen -W "$cur" ) )
+        else
+            COMPREPLY=( $( compgen -P "$cur" -W "{0..9}" ) )
+        fi
+        compopt -o nospace
+        return
+        ;;
+      -o)
+        _filedir
+        return
+        ;;
+      -p)
+        _known_hosts_real "$cur"
+        return
+        ;;
+    esac
+
+    if [[ ${cur} == h* ]] ; then
+        COMPREPLY=( $(compgen -W "http://{a..z}" -- $cur) )
+        return
+    fi
+
+    if [[ ${cur} == -* ]] ; then
+        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        return 0
+    fi
+}
+complete -F _eepget eepget
diff --git a/installer/resources/bash-completion/i2prouter b/installer/resources/bash-completion/i2prouter
new file mode 100644
index 000000000..14d3b1f16
--- /dev/null
+++ b/installer/resources/bash-completion/i2prouter
@@ -0,0 +1,12 @@
+_i2prouter() 
+{
+    local cur prev opts
+    _init_completion || return
+
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    opts="console start stop graceful restart condrestart status install remove dump"
+    COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+}
+complete -F _i2prouter i2prouter
diff --git a/installer/resources/bash-completion/i2prouter-nowrapper b/installer/resources/bash-completion/i2prouter-nowrapper
new file mode 100644
index 000000000..b5dffa33c
--- /dev/null
+++ b/installer/resources/bash-completion/i2prouter-nowrapper
@@ -0,0 +1,12 @@
+_i2prouter-nowrapper() 
+{
+    local cur prev opts
+    _init_completion || return
+
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    opts=""
+    COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+}
+complete -F _i2prouter-nowrapper i2prouter-nowrapper
diff --git a/installer/resources/blocklist.txt b/installer/resources/blocklist.txt
index d3fa92ce6..dc8adc839 100644
--- a/installer/resources/blocklist.txt
+++ b/installer/resources/blocklist.txt
@@ -86,10 +86,15 @@ Sybil:47.88.138.200
 Sybil:47.89.38.177
 Sybil:47.90.1.15
 Sybil:47.90.1.26
+Sybil:47.90.120.30
 Sybil:104.156.254.54
 Sybil:108.61.251.143
 Sybil:133.130.124.185
 Sybil:150.95.128.165
+Sybil:150.95.134.159
+Sybil:150.95.144.95
+Sybil:150.95.147.89
+Sybil:150.95.153.220
 Sybil:163.44.149.31
 Sybil:2001;df6;b800;1128;a163;44;149;310
 Sybil:2001;19f0;4400;4376;5400;ff;fe47;bcbd
@@ -100,3 +105,7 @@ Sybil:2001;19f0;7001;d99;5400;ff;fe41;829c
 Sybil:2001;19f0;7402;24d;5400;ff;fe41;9153
 Sybil:2400;8500;1302;816;a150;95;128;165b
 Sybil:2400;8500;1302;802;a133;130;124;1855
+Sybil:2400;8500;1302;819;a150;95;134;1590
+Sybil:2400;8500;1302;824;a150;95;144;951
+Sybil:2400;8500;1302;825;150;95;147;89
+Sybil:2400;8500;1302;828;a150;95;153;2202
diff --git a/installer/resources/certificates/reseed/randomrng_at_mail.i2p.crt b/installer/resources/certificates/reseed/randomrng_at_mail.i2p.crt
new file mode 100644
index 000000000..aa3330ad0
--- /dev/null
+++ b/installer/resources/certificates/reseed/randomrng_at_mail.i2p.crt
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+MIIFzTCCA7WgAwIBAgIQAkW0dwrp8UmNi9MTzU4/QjANBgkqhkiG9w0BAQsFADBy
+MQswCQYDVQQGEwJYWDELMAkGA1UEBxMCWFgxCzAJBgNVBAkTAlhYMR4wHAYDVQQK
+ExVJMlAgQW5vbnltb3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEbMBkGA1UEAwwS
+cmFuZG9tcm5nQG1haWwuaTJwMB4XDTE3MDIyNTE2MTgyM1oXDTI3MDIyNTE2MTgy
+M1owcjELMAkGA1UEBhMCWFgxCzAJBgNVBAcTAlhYMQswCQYDVQQJEwJYWDEeMBwG
+A1UEChMVSTJQIEFub255bW91cyBOZXR3b3JrMQwwCgYDVQQLEwNJMlAxGzAZBgNV
+BAMMEnJhbmRvbXJuZ0BtYWlsLmkycDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
+AgoCggIBAMSUiFKmGKb5sDkuB1mEGfXikfOJA5ATgMROXyY0XkwLWedBCC6pa1/X
+cVOfPDmDdmkPO8Brep7D2CLq21BBb4lAH7LrKHrABNjf1kfAwRAYMon9HsW3Yn+O
+yIAvGbVTXqQlWpeL1ZRGFhU/5h/D5UtEpcIyG0lkBYRfZ52wFKP2WP52TBcGVpj8
+wBQnXfGmAhRUQfKDmJVCB5GLzNSxrmbhbdyBzZMoeOLTaTfMfb7jSIakYzH4f0TZ
+1VE5+z+1BkJ53qVRH7IV1UBtSIBGD/L84wkqM5mIGKnZXiOyZxfKvS/sGr7WZuMu
+NK3ugCFfTZnxYtb0dDPaqeXrdB3OKE/d5ghAOcIyBWrfsRQJlaHSIwvpqz7Hr7vA
+3xSklkvvJoGwCIy2/+bFGP+Z6ietzvF9/mr1NcwxXGH32zjVmDSto+yaDjsMGFu1
+y4L4wUsOQOVsgNYPECC2HZOisUm/iYdw1+Y/PbgZS0sG3KzBZ1HYsvvFiTLZiyZR
++ZFTLmBoI3DPMfmTf0lRWXXWgUnWXDkxqBAV/fvmAc3XQfpI4HrkAYOllmAIStr9
+7OVsBAJiMcYWzx0UIZGBG+PE9uxHnGxVX64n2lKYLoXLWFURVoFJIYn7AJaxTv0N
+r0IduERKqoQ0wyCjZ6RJOtz26GFUe1bPa7rc/VgfbZwUbF17lzAVAgMBAAGjXzBd
+MA4GA1UdDwEB/wQEAwIChDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
+DwYDVR0TAQH/BAUwAwEB/zAbBgNVHQ4EFAQScmFuZG9tcm5nQG1haWwuaTJwMA0G
+CSqGSIb3DQEBCwUAA4ICAQAi4OOKzy7TcaFZccl2lmKp1wxDmaSaf/dhaqpaSKMS
+zzvgO9XIq6CLEY/YqSm5AjU8PsclaC8+g20THCSUHntL3Jxu2dw1m/H30Mg0I1uJ
+G7pyIVYwuwkdbalGQOaS0u3grzWnbCGMzuqeMBi8EBsZ5jsT5LGjgy1GE+BXl2tv
+9EEWhy8dSVh3cy1iaAM6ZhCyj4rSw4odQqH2NWDOFt52cycHe/rpvKKD1AlrmFHQ
+w18WnfUhr43JAyTWKxg/6uwdxb+cBTX0cad8lbOtQLiqNwOxQvEi/4uRrkdKtbRf
+Z+MUI0XIopH2XV5lLExtxXStAaB4mZTgAbFPCnBC0wKQh/sgdXmUWsEEk610NShC
+26jtXuPb43cDyCewUNCZ+jtzbc9pl6/SyatY/i2gAHamvGmeVJFzQkHe7YHRdzeR
+RIqnWGlwSh0roPPRCU2dNdBZ0uH9lYbkG0IzGmEtks+KQqG+1H0yZkSCmArarLfj
+aU5UslG+Zf1imqXtz5kFD/UMMuaQW05Sa/0YO6gW/hLtChHI5Jpd/Qb/KqLkPAM3
+PEVs4H5ZMVa6mLUsLIw9Ra2QozdB9lqoZBMRa0jqgJKxnAgNcWpYtTyJ2PtfA9oE
+xmjE6O3FlNSee4aKxZ2Kz7cTufd/+ndsSSeNuRLQVihXKNqkrQIuow+H/KDw930c
+Cw==
+-----END CERTIFICATE-----
diff --git a/installer/resources/certificates/ssl/download.xxlspeed.com.crt b/installer/resources/certificates/ssl/download.xxlspeed.com.crt
deleted file mode 100644
index 253c0509f..000000000
--- a/installer/resources/certificates/ssl/download.xxlspeed.com.crt
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDLDCCArKgAwIBAgIJAMOgj4vE9qpcMAoGCCqGSM49BAMEMIHTMQswCQYDVQQG
-EwJERTEeMBwGA1UECAwVZG93bmxvYWQueHhsc3BlZWQuY29tMR4wHAYDVQQHDBVk
-b3dubG9hZC54eGxzcGVlZC5jb20xHjAcBgNVBAoMFWRvd25sb2FkLnh4bHNwZWVk
-LmNvbTEeMBwGA1UECwwVZG93bmxvYWQueHhsc3BlZWQuY29tMR4wHAYDVQQDDBVk
-b3dubG9hZC54eGxzcGVlZC5jb20xJDAiBgkqhkiG9w0BCQEWFWRvd25sb2FkLnh4
-bHNwZWVkLmNvbTAeFw0xNTEyMzAxMTI4NDJaFw0yMTA2MjExMTI4NDJaMIHTMQsw
-CQYDVQQGEwJERTEeMBwGA1UECAwVZG93bmxvYWQueHhsc3BlZWQuY29tMR4wHAYD
-VQQHDBVkb3dubG9hZC54eGxzcGVlZC5jb20xHjAcBgNVBAoMFWRvd25sb2FkLnh4
-bHNwZWVkLmNvbTEeMBwGA1UECwwVZG93bmxvYWQueHhsc3BlZWQuY29tMR4wHAYD
-VQQDDBVkb3dubG9hZC54eGxzcGVlZC5jb20xJDAiBgkqhkiG9w0BCQEWFWRvd25s
-b2FkLnh4bHNwZWVkLmNvbTB2MBAGByqGSM49AgEGBSuBBAAiA2IABFObW+pRshVD
-gvMPvGdPGji2DAfdvkl3gvpyiQ0PUqxuTxwtBlwBo6cz2cMnkKdActuvE/VOTRG5
-/z7CcvG7b0+qgrHDffg7C2wWlAN0dSjuoV2Av7VoN1vEU96TCtheSqNQME4wHQYD
-VR0OBBYEFPbEZH9oidjadUfvsnsh23b1jZnVMB8GA1UdIwQYMBaAFPbEZH9oidja
-dUfvsnsh23b1jZnVMAwGA1UdEwQFMAMBAf8wCgYIKoZIzj0EAwQDaAAwZQIwT1py
-AV2hLFL/5ZgwmybdaCBBUsj3cGYroXb/Z2BHLDYmH8enK0DhhWyPdN1a7eCsAjEA
-oQRU7lhXrisckjA2911Q5mA8y2sFAN/PDPrUeU9PI5vDF/ezTi20zULMOqbU1uRz
------END CERTIFICATE-----
diff --git a/installer/resources/certificates/ssl/reseed.i2p-projekt.de.crt b/installer/resources/certificates/ssl/reseed.i2p-projekt.de.crt
deleted file mode 100644
index 75f43dd66..000000000
--- a/installer/resources/certificates/ssl/reseed.i2p-projekt.de.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID7TCCAtWgAwIBAgIJAOHakoadaLRiMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
-VQQGEwJBVDEQMA4GA1UECAwHQXVzdHJpYTENMAsGA1UEBwwER3JhejEMMAoGA1UE
-CgwDSTJQMQ8wDQYDVQQLDAZSZXNlZWQxHjAcBgNVBAMMFXJlc2VlZC5pMnAtcHJv
-amVrdC5kZTEdMBsGCSqGSIb3DQEJARYOcmVzZWVkQGkycDIuZGUwHhcNMTQwNTEw
-MTAxOTM3WhcNMjQwNTA3MTAxOTM3WjCBjDELMAkGA1UEBhMCQVQxEDAOBgNVBAgM
-B0F1c3RyaWExDTALBgNVBAcMBEdyYXoxDDAKBgNVBAoMA0kyUDEPMA0GA1UECwwG
-UmVzZWVkMR4wHAYDVQQDDBVyZXNlZWQuaTJwLXByb2pla3QuZGUxHTAbBgkqhkiG
-9w0BCQEWDnJlc2VlZEBpMnAyLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA8t5igIeAUZVX9k/A2gudRWVfToIV4yvlxmnH9UTJ8DTkWfHGbY9MmW2+
-b0ZdvIZDcgg1nvcLEKqCDQnIp3wLGdM8fdVSXqxA1dLyHdk6IrGVqb60qpGENeIc
-EHiUeB1g0KqP4kLcj2sNlo+Vupjnu7qS8v0/LfZ3fq2m4vtx8dYnvo+JIzGL9K0f
-/DOil8QIcdTZupzMbXd6P936Blm/1RdbW/uKROOuuYE38NwYOUCq2/Nd+T86S5DD
-9wQBjy0U+9nNayWf6BOSuP6m2mxx/pA1CvKRq7CzI0Gqjo2Msd+i0dTL2WIO2JDp
-5uykZ0GabRW3UrMEuyrzzK6U2RZ1dQIDAQABo1AwTjAdBgNVHQ4EFgQUIejD2MMl
-6PpcCernYd3ku3sEWfswHwYDVR0jBBgwFoAUIejD2MMl6PpcCernYd3ku3sEWfsw
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAupUg3ZTBSE7iRebjcZ+y
-zgnRaClmgrv8Mpa1/weTuXKhJZ65k6+G5mplI5hN/crKi/3b6oyfRrYhgdTdb0rD
-2CbrhBkPGGlubhkjkxWjAhibzU6Kt3a7WOjykGnslpCZhwS/hiVB7ZE2JGdphFld
-aJTKt12CytyP3GyIQyyX7O2t92dk8cW4tlxRVpaPNr59lk0V50qpvNmNyhxv3yDz
-taop/etfjHStq1YrltHWH0d4Dxy8ubb7nV19uvPcE0+MrR2xm7jvOBfGjAf1bQ7Z
-rk7RMHio4xWFJZO7TSzL5/8EH2jX6ZqpH+hZ6sV8TmzuRWsPkm0doXWr+HBZ/gMt
-5w==
------END CERTIFICATE-----
diff --git a/installer/resources/certificates/ssl/reseed.i2p.vzaws.com2017.crt b/installer/resources/certificates/ssl/reseed.i2p.vzaws.com2017.crt
new file mode 100644
index 000000000..336b7bb53
--- /dev/null
+++ b/installer/resources/certificates/ssl/reseed.i2p.vzaws.com2017.crt
@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIIFxzCCA7GgAwIBAgIQQQDJgnu4y1EUQnC2j43jNjALBgkqhkiG9w0BAQswdDEL
+MAkGA1UEBhMCWFgxHjAcBgNVBAoTFUkyUCBBbm9ueW1vdXMgTmV0d29yazEMMAoG
+A1UECxMDSTJQMQswCQYDVQQHEwJYWDELMAkGA1UECRMCWFgxHTAbBgNVBAMTFHJl
+c2VlZC5pMnAudnphd3MuY29tMB4XDTE3MDMxNjE3MzEwNloXDTE5MDMxNjE3MzEw
+NlowdDELMAkGA1UEBhMCWFgxHjAcBgNVBAoTFUkyUCBBbm9ueW1vdXMgTmV0d29y
+azEMMAoGA1UECxMDSTJQMQswCQYDVQQHEwJYWDELMAkGA1UECRMCWFgxHTAbBgNV
+BAMTFHJlc2VlZC5pMnAudnphd3MuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAqZgytdvdPW2E5smueR5Fl/85dYz+KRlb9BoWT4oqNpQq9jUSS189
+6U7Q4B9maH0duScGB/u8hBT/8XDIFn0u1D0AGE8x2/7dzCQLL6ApJ8i0yiCZKe1N
+SmBxKw4czWBwrxdaN6weF86z8goaqzgAeH68kOPVwH36JKTk+Z0gcC148MNNqRwo
+87tIkr+f8QaY7AOXZ+HUjkzTW1Y6y3LiDsuLBQIF9N6rdfxEWY5GSHgNUL96I0nR
+8TSLHfHteWl+50FAQvuCl4BBPHd1ZIOix11Mus0SLnmU/OJzgqMbjxP6DboPPsyH
+7uh8SGND37/LPoSEKEfe0VPsu4mNF6hDl6IYe6Na1z8u2AFvm1b2Zo/HpChj/5+v
+sUvBbp6laJCyJ9GPyo7wDHf44NIj02slm10ZC0+vSf3YDpSvpCjjjdZwGn3PVLxC
+u2zTp63BaXkAbp5zGCNsfMOD1YoN0XBrKRgEHJWD9j9bnnG9IKP0Y8WxeRz7qydd
+p0TxDuSaDgjX3SBdgeSMYCXnIroRujBVbRoGsCswHPEY/3y5B4elDmJWaFO19V3t
+GRK2oOcxMskqutdqi+fnlBWVHuPvEz2FLqNNbdXP+gXq/fNH7cNHSDjYQi98Rhbo
+992UDWn58QLbDGrLGqLaaOEcttY/nwFeTft5FUWw6Q6C0cCf1K/0pjUCAwEAAaNZ
+MFcwDgYDVR0PAQH/BAQDAgCkMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA8GA1UdEwEB
+/wQFMAMBAf8wHwYDVR0RBBgwFoIUcmVzZWVkLmkycC52emF3cy5jb20wCwYJKoZI
+hvcNAQELA4ICAQAW1U+mg2XaEN5hmhGHe8Pd9H/KGG6Xz+uIoXHAoaDC3fbbtX5h
+n+QOiWngbvjbcFK4W+Jk6ebHkOXAAK+DV1qYLSSN/wMVuv6m3rrIxZIXvVUM+JsR
+q2V8uU0Dl1ndMxZeZxTqV8fX8CHMcyfjLuZqU++9pH8EbYoLU52Kvhj/l0yx4EoL
+/6MtadtWfifVqm3V4HmFlcQy287YE7QBmtRWNhiem2LCezckcOyL8MTkfu2jT8u5
+xy3LnOvzaLbeKyeZqCzVQdEy4WXYXizuISeVAerKwuzvRO8qAQNMBYs9CKZ09lkL
+5gzlOsPrdrlPJRQ2Kqh94LGP2Nxfvn28knS8awBh9Ug5XLKTxgWVz27EK7MTuKj5
+5pNRiEYk1ecFz+6te07tDeWFY3+gsGkdwYyczyLooXBlD1wTWWM1Je6n3YGRzFa7
+fcCpbRs1un0Hi9pvMM7xATKl7NbhDbq5oHdcndoLFhxxe5iVo/sEfpbCFW+PrwDH
+LtsozFIffr8QDEoS3Q6loESQK8LMACx5x5NEq9uyoijIMS4WCaIPDp/W+t4YCyiU
+w5uvnNied/+iAqDIAJcktcdGGQHFg5bxTkj20/ztquXdjEwnawXTVzOR9AIBDYTv
+kz15zogsOhKfHz0qOD/A7QPxEcE9nNjYpqOamb5M39emIslDOmImNQ8Jlw==
+-----END CERTIFICATE-----
diff --git a/installer/resources/certificates/ssl/uk.reseed.i2p2.no.crt b/installer/resources/certificates/ssl/uk.reseed.i2p2.no.crt
deleted file mode 100644
index 84f3f073d..000000000
--- a/installer/resources/certificates/ssl/uk.reseed.i2p2.no.crt
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFsTCCA5mgAwIBAgIJANgzPow6thRuMA0GCSqGSIb3DQEBBQUAMG8xCzAJBgNV
-BAYTAk5PMQ0wCwYDVQQIDARPc2xvMQswCQYDVQQHDAJVSzETMBEGA1UECgwKSTJQ
-IFJlc2VlZDETMBEGA1UECwwKSTJQIFJlc2VlZDEaMBgGA1UEAwwRdWsucmVzZWVk
-LmkycDIubm8wHhcNMTQwNjI4MjA0OTA3WhcNMjQwNjI1MjA0OTA3WjBvMQswCQYD
-VQQGEwJOTzENMAsGA1UECAwET3NsbzELMAkGA1UEBwwCVUsxEzARBgNVBAoMCkky
-UCBSZXNlZWQxEzARBgNVBAsMCkkyUCBSZXNlZWQxGjAYBgNVBAMMEXVrLnJlc2Vl
-ZC5pMnAyLm5vMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxlVlXWn5
-Ham6ZqM6FkH6ZoXeXbncY/PnF669mCPcrPH56V2xZXwpeCXHWfu7YiHuhXXZSmzP
-zwRrawHZTJulHt4e6j27JnDuEj69gmFpyi4B1djQ0kav0aJeagwCPG2do/UD7Cbr
-4nITkU4CifLe47IUW/2K/EBI6bZGsRIDHJ3A+fAQmLnvehEkpvLN+cvtkpJOtZYx
-6WvbwLsirkISnaio4//UY8M4poIu9mSG5pvNLagn9uoRPUSuj8jDEysB1Nmh12Zu
-gFnt2XcxQB9/0krB5GnDTodrgfsz/UPbk44l4kFmQoLv5ACFndH69RKftogisauj
-VVUrqCL3l9TcNsx8GLqZkeWhCwdZycZFjBhK01zihTYPEiU2HXfCNWhzLqxrM2Hh
-r1ci+56fyNdn/ssO4o3hrGaWPDiayiHlEGEJxaG/ueKX2c3c0UJKkIGBPTEcdBjW
-q42n/7EhY/ISaieQXPRK+gVm18I1OlGUH5FEYELO20bL88J8pr/bYuJyJnC8fiMP
-YzKZuiVhey6dPr0zZgNDHyRbOlZqQllzKd1wbzbE4xqdUZfBWYwtRpdOJKDw4eoi
-M69TwPQFfudeiudnMcR1gN37OkxS7UTEdsYIB5urgLb6qQD+tYFsxpcVPkedJw62
-3TobhZjucaEZWzePd4u9faT9mQBXBAgY6VcCAwEAAaNQME4wHQYDVR0OBBYEFDTN
-QRqhzaLc6XX2gFg26K//e0+8MB8GA1UdIwQYMBaAFDTNQRqhzaLc6XX2gFg26K//
-e0+8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBACcJ99Z45ghglvL3
-/yMnx6IkOSneEm2/ADQoOabBQSC2grRAMBescKUiqpgbpBFalIPbPJUVrlH9tXYB
-izNhqWETBY2tNy7AEHcJcCsAFuC2gOhaFH7FLgPA8V5IJmZ+McjB8REyowcN+CP4
-GDY8s5/yr9S3HpKLD80UV18UX/j5m4b6I1w61QceMOSt6ahTtlnyvNBonFW94L1c
-RmkdbhxYWn2eeUas62Q/+9bjr24E0weDKqopa3bbO7MWJ3mKkS4rua42j8GG3Q3q
-UWPGh4zm+2+Ncjmz0Ho73RyYDDcp9IjwlAEv+NW86rz/5Pdkhoy+SzQwFYAwNgaQ
-FRKb6ltpslxmu3tUdZ7Ydrj6MBGQyH2gRVm9qByro7WGI4UsyzsjP009Iu6dbhdC
-2ddTGMisXF3dOmdRWh8dlggmW6gV4iaVgZkzLtrc9S0SK66utKMVXa4EUTm6XogX
-F5ImPnVzIMo2qF2pP31aGDzKqJF3GNjGj+xHRVau5whz0a4ESY6V14PLTEL4Vc/H
-J9uLCySifvqN+jzs5iY2QvNXjg2zPaTJbnjxxpYQJVSQHX6SyRcszhChqQzxnbyo
-+S19BRclqzufRq6pp6VcOiID0BB7qPcrUHM9h1ingMXcZZlGBgHew9cY7tb5TAox
-o+aTNc4k/7E543FVbs40dpOD2Fcr
------END CERTIFICATE-----
diff --git a/installer/resources/certificates/ssl/us.reseed.i2p2.no.crt b/installer/resources/certificates/ssl/us.reseed.i2p2.no.crt
deleted file mode 100644
index eae724e96..000000000
--- a/installer/resources/certificates/ssl/us.reseed.i2p2.no.crt
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDUDCCAjgCCQCkTcCJMdZV7zANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJO
-TzENMAsGA1UECAwET3NsbzENMAsGA1UEBwwET3NsbzENMAsGA1UECgwET3NsbzES
-MBAGA1UECwwJTm9yZGNsb3VkMRowGAYDVQQDDBF1cy5yZXNlZWQuaTJwMi5ubzAe
-Fw0xNDA2MjcyMjQxMjFaFw0yNDA2MjQyMjQxMjFaMGoxCzAJBgNVBAYTAk5PMQ0w
-CwYDVQQIDARPc2xvMQ0wCwYDVQQHDARPc2xvMQ0wCwYDVQQKDARPc2xvMRIwEAYD
-VQQLDAlOb3JkY2xvdWQxGjAYBgNVBAMMEXVzLnJlc2VlZC5pMnAyLm5vMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAomVoBEc53jzy3xGMfgRaKyX6MaGG
-KAmwu0uMTX6bVzGjy56JMMq3luoxOrpvgrNZF52lu7i36Tejo0HM75AHoea1es55
-DNLmrlDeqzlBU2WibOnizbB8G+tlMEbx8eAGAWk/Wv/vH8CAKmxjImslmbajzZC2
-LEH7inp3J5T2sVV7zmXeL9OEPKNyohbu6Mrno2IAlEOr8cu+lWAaFWzpknnR1gBX
-NkB/8+7vK5Fq4MT7B0qnXPxmaWDbUOepPPni8u+2L9+qt19vZH4/6KNuH7xd7JLz
-FfIdol6jy2cBQyAK7cVKWDHNk7ceB4Dl0mjBDbBIRTtLK+rfdnVmfWn8aQIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQCQH4QJMp5xneh2ah7fiuVdtKbiv6QNunRz7nb/
-mWYyqmBX7EHL8jOG5qmPELDgDt58HmnaYMo05nEJb9JhAoviEDXSYw0s6eN4n4nc
-MKqgR/HLLSiXPwT+Wi1MI57OYim5AFTUCYTSaWFUT+dZKYb0QPE1XjGpQXi3ppsJ
-3TJG71tOzJmZT6vRPmdTHJO70v6ZEhr5w4SiGx07gNmcgO8WRyb5ajOwSHiGKrj6
-UsuRNhtCyZaAEmelR9mfKBR1J2Nb+9jTz6mJtpT82WY3bst6mFk+A+mMWBQy7Hjt
-gpdSDBCcFx9if+AKINGLgFvFKV2q8UzbfXms19NsVt9Hu7W3
------END CERTIFICATE-----
diff --git a/installer/resources/checklist.md b/installer/resources/checklist.md
index 61a738f23..dadb4fb28 100644
--- a/installer/resources/checklist.md
+++ b/installer/resources/checklist.md
@@ -15,7 +15,11 @@
 - replace header
 - fix date in header (get date from HEAD)
 - ./makegeoipv6.sh
-- mtn ci geoip.txt geoipv5.dat.gz
+- mtn ci geoip.txt geoipv6.dat.gz
+
+- BuildTime: Don't have to do this every release, but update the
+  EARLIEST and EARLIEST_LONG values in ~/mtn/i2p/core/java/src/net/i2p/time/BuildTime.java
+  to the current date, more or less.
 
 
 ## A day or two before
@@ -238,6 +242,7 @@
   - `i2p2www/__init__.py` (release number)
   - `i2p2www/pages/downloads/list.html` (release signer, if changed)
   - `i2p2www/pages/downloads/macros` (checksums)
+  - `i2p2www/pages/site/get-involved/roadmap.html` (release date, actual release contents)
   - `i2p2www/static/news/news.xml` (no longer necessary)
   - Sync with mtn.i2p-projekt.i2p
 
diff --git a/installer/resources/deletelist.txt b/installer/resources/deletelist.txt
index 259a9d432..9acd77098 100644
--- a/installer/resources/deletelist.txt
+++ b/installer/resources/deletelist.txt
@@ -101,6 +101,10 @@ certificates/ssl/i2pseed.zarrenspry.info.crt
 certificates/reseed/cheezybudz_at_mail.i2p.crt
 certificates/reseed/j_at_torontocrypto.org.crt
 certificates/ssl/user.mx24.eu.crt
+certificates/ssl/reseed.i2p-projekt.de.crt
+certificates/ssl/download.xxlspeed.com.crt
+certificates/ssl/uk.reseed.i2p2.no.crt
+certificates/ssl/us.reseed.i2p2.no.crt
 # vanished
 certificates/news/killyourtv_at_mail.i2p.crt
 certificates/router/killyourtv_at_mail.i2p.crt
diff --git a/installer/resources/eepsite/jetty-jmx.xml b/installer/resources/eepsite/jetty-jmx.xml
index 4db0dbb47..aca96f7c2 100644
--- a/installer/resources/eepsite/jetty-jmx.xml
+++ b/installer/resources/eepsite/jetty-jmx.xml
@@ -1,103 +1,43 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
 
-<!-- ============================================================================ -->
-<!-- To correctly start Jetty with JMX module enabled, this configuration         -->
-<!-- file must appear first in the list of the configuration files.               -->
-<!-- The simplest way to achieve this is to add etc/jetty-jmx.xml as the          -->
-<!-- first file in configuration file list at the end of start.ini file.          -->
-<!-- ============================================================================ -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <!-- =========================================================== -->
   <!-- Set the java.rmi.server.hostname property in case you've    -->
   <!-- got a misconfigured /etc/hosts entry or the like.           -->
   <!-- =========================================================== -->
-  <!-- 
+  <!--
   <Call class="java.lang.System" name="setProperty">
     <Arg>java.rmi.server.hostname</Arg>
     <Arg>127.0.0.1</Arg>
   </Call>
   -->
-  
+
   <!-- =========================================================== -->
-  <!-- Initialize an mbean server                                  -->
+  <!-- Get the platform mbean server                               -->
   <!-- =========================================================== -->
   <Call id="MBeanServer" class="java.lang.management.ManagementFactory"
     name="getPlatformMBeanServer" />
 
   <!-- =========================================================== -->
-  <!-- Initialize the Jetty MBean container                        -->
+  <!-- Initialize the Jetty MBean container -->
   <!-- =========================================================== -->
-  <New id="MBeanContainer" class="org.eclipse.jetty.jmx.MBeanContainer">
-    <Arg><Ref id="MBeanServer" /></Arg>
-    <Call name="start"/>
-  </New>
-
-  <!-- Add to the Server to listen for object events -->
-  <Get id="Container" name="container">
-    <Call name="addEventListener">
-      <Arg><Ref id="MBeanContainer" /></Arg>
-    </Call>
-  </Get>
-
-  <!-- Add to the Server as a managed lifecycle -->
   <Call name="addBean">
-    <Arg><Ref id="MBeanContainer"/></Arg>
-    <Arg type="boolean">true</Arg>
+    <Arg>
+      <New id="MBeanContainer" class="org.eclipse.jetty.jmx.MBeanContainer">
+        <Arg>
+          <Ref refid="MBeanServer" />
+        </Arg>
+      </New>
+    </Arg>
   </Call>
 
   <!-- Add the static log -->
-  <Ref id="MBeanContainer">
-    <Call name="addBean">
-      <Arg>
-        <New class="org.eclipse.jetty.util.log.Log"/>
-      </Arg>
-    </Call>
-  </Ref>
-  
-  <!-- In order to connect to the JMX server remotely from a different
-       process, possibly running on a different host, Jetty JMX module
-       can create a remote JMX connector. It requires RMI registry to
-       be started prior to creating the connector server because the
-       JMX specification uses RMI to facilitate connections.        
-   -->
-
-  <!-- Optionally start the RMI registry. Normally RMI registry runs on
-       port 1099. The argument below can be changed in order to comply
-       with the firewall requirements.
-  -->
-  <!--
-  <Call name="createRegistry" class="java.rmi.registry.LocateRegistry">
-    <Arg type="java.lang.Integer"><SystemProperty name="jetty.jmxrmiport" default="1099"/></Arg>
-    <Call name="sleep" class="java.lang.Thread">
-       <Arg type="java.lang.Integer">1000</Arg>
-    </Call>
-  </Call>
-  -->
- 
-  <!-- Optionally add a remote JMX connector. The parameters of the constructor
-       below specify the JMX service URL, and the object name string for the
-       connector server bean. The parameters of the JMXServiceURL constructor 
-       specify the protocol that clients will use to connect to the remote JMX
-       connector (RMI), the hostname of the server (local hostname), port number
-       (automatically assigned), and the URL path. Note that URL path contains
-       the RMI registry hostname and port number, that may need to be modified
-       in order to comply with the firewall requirements. 
-  -->
-  <!--
-  <New id="ConnectorServer" class="org.eclipse.jetty.jmx.ConnectorServer">
+  <Call name="addBean">
     <Arg>
-      <New class="javax.management.remote.JMXServiceURL">
-        <Arg type="java.lang.String">rmi</Arg>
-        <Arg type="java.lang.String" />
-        <Arg type="java.lang.Integer"><SystemProperty name="jetty.jmxrmiport" default="1099"/></Arg>
-        <Arg type="java.lang.String">/jndi/rmi://<SystemProperty name="jetty.jmxrmihost" default="localhost"/>:<SystemProperty name="jetty.jmxrmiport" default="1099"/>/jmxrmi</Arg>
-      </New>
+      <New class="org.eclipse.jetty.util.log.Log" />
     </Arg>
-    <Arg>org.eclipse.jetty.jmx:name=rmiconnectorserver</Arg>
-    <Call name="start" />
-  </New>
-  -->
+  </Call>
 </Configure>
 
diff --git a/installer/resources/eepsite/jetty-rewrite.xml b/installer/resources/eepsite/jetty-rewrite.xml
index 1d208f8bf..1f93937d5 100644
--- a/installer/resources/eepsite/jetty-rewrite.xml
+++ b/installer/resources/eepsite/jetty-rewrite.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Mixin the RewriteHandler                                        -->
@@ -9,13 +9,13 @@
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
     <!-- =========================================================== -->
-    <!-- configure rewrite handler                                   --> 
+    <!-- configure rewrite handler                                   -->
     <!-- =========================================================== -->
     <Get id="oldhandler" name="handler"/>
 
     <Set name="handler">
      <New id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
-      <Set name="handler"><Ref id="oldhandler"/></Set>
+      <Set name="handler"><Ref refid="oldhandler"/></Set>
       <Set name="rewriteRequestURI">true</Set>
       <Set name="rewritePathInfo">false</Set>
       <Set name="originalPathAttribute">requestedPath</Set>
@@ -68,7 +68,7 @@
           </New>
         </Arg>
       </Call>
-      
+
       <!-- reverse the order of the path sections -->
       <Call name="addRule">
         <Arg>
@@ -89,7 +89,7 @@
           </New>
         </Arg>
       </Call>
-      
+
       <!--  actual redirect, instead of internal rewrite -->
       <Call name="addRule">
         <Arg>
@@ -113,5 +113,5 @@
 
      </New>
     </Set>
-    
+
 </Configure>
diff --git a/installer/resources/eepsite/jetty-ssl.xml b/installer/resources/eepsite/jetty-ssl.xml
index b91d5c25c..5b4268433 100644
--- a/installer/resources/eepsite/jetty-ssl.xml
+++ b/installer/resources/eepsite/jetty-ssl.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
+<!-- This configuration supports Jetty 9. Do not remove this line. -->
+
 <!-- ========================================================================= -->
 <!-- If you have a 'split' directory installation, with configuration          -->
 <!-- files in ~/.i2p (Linux), %APPDATA%\I2P (Windows),                         -->
@@ -175,87 +177,108 @@
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
-  <!-- if NIO is not available, use org.eclipse.jetty.server.ssl.SslSocketConnector -->
-  
-  <New id="sslContextFactory" class="org.eclipse.jetty.http.ssl.SslContextFactory">
-    <Set name="KeyStore">./eepsite/etc/keystore.ks</Set>
+  <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
+    <Set name="KeyStorePath">./eepsite/etc/keystore.ks</Set>
     <Set name="KeyStorePassword">changeit</Set>
     <Set name="KeyManagerPassword">myKeyPassword</Set>
-    <Set name="TrustStore">./eepsite/etc/keystore.ks</Set>
+    <Set name="TrustStorePath">./eepsite/etc/keystore.ks</Set>
     <Set name="TrustStorePassword">changeit</Set>
+    <Set name="ExcludeCipherSuites">
+      <Array type="java.lang.String">
+        <Item>SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA</Item>
+        <Item>SSL_DH_anon_EXPORT_WITH_RC4_40_MD5</Item>
+        <Item>SSL_DH_anon_WITH_3DES_EDE_CBC_SHA</Item>
+        <Item>SSL_DH_anon_WITH_DES_CBC_SHA</Item>
+        <Item>SSL_DH_anon_WITH_RC4_128_MD5</Item>
+        <Item>SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</Item>
+        <Item>SSL_DHE_DSS_WITH_DES_CBC_SHA</Item>
+        <Item>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
+        <Item>SSL_DHE_RSA_WITH_DES_CBC_SHA</Item>
+        <Item>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
+        <Item>SSL_RSA_EXPORT_WITH_RC4_40_MD5</Item>
+        <Item>SSL_RSA_WITH_DES_CBC_SHA</Item>
+        <Item>SSL_RSA_WITH_NULL_MD5</Item>
+        <Item>SSL_RSA_WITH_NULL_SHA</Item>
+        <Item>TLS_DH_anon_WITH_AES_128_CBC_SHA</Item>
+        <Item>TLS_DH_anon_WITH_AES_128_CBC_SHA256</Item>
+        <Item>TLS_DH_anon_WITH_AES_128_GCM_SHA256</Item>
+        <Item>TLS_DH_anon_WITH_AES_256_CBC_SHA</Item>
+        <Item>TLS_DH_anon_WITH_AES_256_CBC_SHA256</Item>
+        <Item>TLS_DH_anon_WITH_AES_256_GCM_SHA384</Item>
+        <Item>TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA</Item>
+        <Item>TLS_ECDH_anon_WITH_AES_128_CBC_SHA</Item>
+        <Item>TLS_ECDH_anon_WITH_AES_256_CBC_SHA</Item>
+        <Item>TLS_ECDH_anon_WITH_NULL_SHA</Item>
+        <Item>TLS_ECDH_anon_WITH_RC4_128_SHA</Item>
+        <Item>TLS_ECDH_ECDSA_WITH_NULL_SHA</Item>
+        <Item>TLS_ECDHE_ECDSA_WITH_NULL_SHA</Item>
+        <Item>TLS_ECDHE_RSA_WITH_NULL_SHA</Item>
+        <Item>TLS_ECDH_RSA_WITH_NULL_SHA</Item>
+        <Item>TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5</Item>
+        <Item>TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA</Item>
+        <Item>TLS_KRB5_EXPORT_WITH_RC4_40_MD5</Item>
+        <Item>TLS_KRB5_EXPORT_WITH_RC4_40_SHA</Item>
+        <Item>TLS_KRB5_WITH_3DES_EDE_CBC_MD5</Item>
+        <Item>TLS_KRB5_WITH_3DES_EDE_CBC_SHA</Item>
+        <Item>TLS_KRB5_WITH_DES_CBC_MD5</Item>
+        <Item>TLS_KRB5_WITH_DES_CBC_SHA</Item>
+        <Item>TLS_KRB5_WITH_RC4_128_MD5</Item>
+        <Item>TLS_KRB5_WITH_RC4_128_SHA</Item>
+        <Item>TLS_RSA_WITH_NULL_SHA256</Item>
+        <Item>SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA</Item>
+        <Item>SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA</Item>
+        <Item>SSL_RSA_WITH_3DES_EDE_CBC_SHA</Item>
+        <Item>SSL_RSA_WITH_RC4_128_MD5</Item>
+        <Item>SSL_RSA_WITH_RC4_128_SHA</Item>
+        <Item>TLS_ECDH_ECDSA_WITH_RC4_128_SHA</Item>
+        <Item>TLS_ECDH_RSA_WITH_RC4_128_SHA</Item>
+        <Item>TLS_ECDHE_ECDSA_WITH_RC4_128_SHA</Item>
+        <Item>TLS_ECDHE_RSA_WITH_RC4_128_SHA</Item>
+        <Item>TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA</Item>
+        <Item>TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA</Item>
+        <Item>TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA</Item>
+        <Item>TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA</Item>
+        <Item>TLS_DHE_DSS_WITH_AES_128_CBC_SHA</Item>
+        <!-- Please keep this list in sync with the one in I2PSSLSocketFactory -->
+      </Array>
+    </Set>
+    <Set name="ExcludeProtocols">
+      <Array type="java.lang.String">
+        <Item>SSLv2Hello</Item>
+        <Item>SSLv3</Item>
+      </Array>
+    </Set>
   </New>
 
   <Call name="addConnector">
     <Arg>
-      <New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
-        <Arg><Ref id="sslContextFactory" /></Arg>
+      <New class="org.eclipse.jetty.server.ServerConnector">
+        <Arg><Ref id="Server" /></Arg>
+        <Arg type="int">1</Arg>     <!-- number of acceptors -->
+        <Arg type="int">0</Arg>     <!-- default number of selectors -->
+        <Arg>
+           <Array type="org.eclipse.jetty.server.ConnectionFactory">    <!-- varargs so we need an array -->
+              <Item>
+                <New class="org.eclipse.jetty.server.SslConnectionFactory">
+                  <Arg><Ref id="sslContextFactory" /></Arg>
+                  <Arg>http/1.1</Arg>
+                </New>
+              </Item>
+              <Item>
+                <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                  <Arg>
+                    <New class="org.eclipse.jetty.server.HttpConfiguration">
+                      <Set name="sendServerVersion">false</Set>
+                      <Set name="sendDateHeader">true</Set>
+                    </New>
+                  </Arg>
+                </New>
+              </Item>
+            </Array>
+        </Arg>
         <Set name="host">127.0.0.1</Set>
         <Set name="port">7668</Set>
-        <Set name="maxIdleTime">600000</Set>
-        <Set name="useDirectBuffers">false</Set>
-        <Set name="acceptors">1</Set>
-        <Set name="statsOn">false</Set>
-        <Set name="lowResourcesConnections">5000</Set>
-        <Set name="lowResourcesMaxIdleTime">5000</Set>
-        <Set name="ExcludeCipherSuites">
-          <Array type="java.lang.String">
-            <Item>SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA</Item>
-            <Item>SSL_DH_anon_EXPORT_WITH_RC4_40_MD5</Item>
-            <Item>SSL_DH_anon_WITH_3DES_EDE_CBC_SHA</Item>
-            <Item>SSL_DH_anon_WITH_DES_CBC_SHA</Item>
-            <Item>SSL_DH_anon_WITH_RC4_128_MD5</Item>
-            <Item>SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</Item>
-            <Item>SSL_DHE_DSS_WITH_DES_CBC_SHA</Item>
-            <Item>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
-            <Item>SSL_DHE_RSA_WITH_DES_CBC_SHA</Item>
-            <Item>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
-            <Item>SSL_RSA_EXPORT_WITH_RC4_40_MD5</Item>
-            <Item>SSL_RSA_WITH_DES_CBC_SHA</Item>
-            <Item>SSL_RSA_WITH_NULL_MD5</Item>
-            <Item>SSL_RSA_WITH_NULL_SHA</Item>
-            <Item>TLS_DH_anon_WITH_AES_128_CBC_SHA</Item>
-            <Item>TLS_DH_anon_WITH_AES_128_CBC_SHA256</Item>
-            <Item>TLS_DH_anon_WITH_AES_128_GCM_SHA256</Item>
-            <Item>TLS_DH_anon_WITH_AES_256_CBC_SHA</Item>
-            <Item>TLS_DH_anon_WITH_AES_256_CBC_SHA256</Item>
-            <Item>TLS_DH_anon_WITH_AES_256_GCM_SHA384</Item>
-            <Item>TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA</Item>
-            <Item>TLS_ECDH_anon_WITH_AES_128_CBC_SHA</Item>
-            <Item>TLS_ECDH_anon_WITH_AES_256_CBC_SHA</Item>
-            <Item>TLS_ECDH_anon_WITH_NULL_SHA</Item>
-            <Item>TLS_ECDH_anon_WITH_RC4_128_SHA</Item>
-            <Item>TLS_ECDH_ECDSA_WITH_NULL_SHA</Item>
-            <Item>TLS_ECDHE_ECDSA_WITH_NULL_SHA</Item>
-            <Item>TLS_ECDHE_RSA_WITH_NULL_SHA</Item>
-            <Item>TLS_ECDH_RSA_WITH_NULL_SHA</Item>
-            <Item>TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5</Item>
-            <Item>TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA</Item>
-            <Item>TLS_KRB5_EXPORT_WITH_RC4_40_MD5</Item>
-            <Item>TLS_KRB5_EXPORT_WITH_RC4_40_SHA</Item>
-            <Item>TLS_KRB5_WITH_3DES_EDE_CBC_MD5</Item>
-            <Item>TLS_KRB5_WITH_3DES_EDE_CBC_SHA</Item>
-            <Item>TLS_KRB5_WITH_DES_CBC_MD5</Item>
-            <Item>TLS_KRB5_WITH_DES_CBC_SHA</Item>
-            <Item>TLS_KRB5_WITH_RC4_128_MD5</Item>
-            <Item>TLS_KRB5_WITH_RC4_128_SHA</Item>
-            <Item>TLS_RSA_WITH_NULL_SHA256</Item>
-            <Item>SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA</Item>
-            <Item>SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA</Item>
-            <Item>SSL_RSA_WITH_3DES_EDE_CBC_SHA</Item>
-            <Item>SSL_RSA_WITH_RC4_128_MD5</Item>
-            <Item>SSL_RSA_WITH_RC4_128_SHA</Item>
-            <Item>TLS_ECDH_ECDSA_WITH_RC4_128_SHA</Item>
-            <Item>TLS_ECDH_RSA_WITH_RC4_128_SHA</Item>
-            <Item>TLS_ECDHE_ECDSA_WITH_RC4_128_SHA</Item>
-            <Item>TLS_ECDHE_RSA_WITH_RC4_128_SHA</Item>
-            <Item>TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA</Item>
-            <Item>TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA</Item>
-            <Item>TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA</Item>
-            <Item>TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA</Item>
-            <Item>TLS_DHE_DSS_WITH_AES_128_CBC_SHA</Item>
-            <!-- Please keep this list in sync with the one in I2PSSLSocketFactory -->
-          </Array>
-        </Set>
+        <Set name="idleTimeout">600000</Set>
       </New>
     </Arg>
   </Call>
diff --git a/installer/resources/eepsite/jetty.xml b/installer/resources/eepsite/jetty.xml
index 5e9ad9e84..dd2be4ddd 100644
--- a/installer/resources/eepsite/jetty.xml
+++ b/installer/resources/eepsite/jetty.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?> 
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
+<!-- This configuration supports Jetty 9. Do not remove this line. -->
+
 <!-- ========================================================================= -->
 <!-- This file configures the Jetty server.                                    -->
 <!-- All changes require a restart of I2P.                                     -->
@@ -12,16 +14,16 @@
 <!--   * port: Default 7658 in the addConnector section                         -->
 <!--   * docroot: Change the ResourceBase in the contexts/base-context.xml file -->
 <!--           to serve files from a different location.                       -->
-<!--   * threads: Raise maximumPoolSize in the ThreadPool section              -->
+<!--   * threads: Raise maxThreads in the ThreadPool section                   -->
 <!--           if you have a high-traffic site and get a lot of warnings.      -->
 <!--   * Uncomment the addWebApplications section to use to enable             -->
 <!--           war files placed in the webapps/ dir.                           -->
 <!--   * Uncomment the line to allow Jetty to follow symlinks                  -->
 <!--                                                                           -->
-<!-- I2P uses Jetty 7. If you need web server features not found               -->
-<!-- in Jetty 7, you may install and run Jetty 7 or 8 in a different JVM       -->
+<!-- I2P uses Jetty 9. If you need web server features not found               -->
+<!-- in Jetty 9, you may install and run Jetty 7 or 8 in a different JVM       -->
 <!-- or run any other web server such as Apache. If you do run another web     -->
-<!-- server instead, be sure and disable the Jetty 6 server for your           -->
+<!-- server instead, be sure and disable the Jetty 9 server for your           -->
 <!-- eepsite on http://127.0.0.1:7657/configclients.jsp .                      -->
 <!--                                                                           -->
 <!-- Jetty now uses the I2P logging system rather than wrapper.log.            -->
@@ -41,13 +43,13 @@
 <!--                                                                           -->
 <!-- ========================================================================= -->
 
-<!-- =============================================================== -->
-<!-- Configure the Jetty Server                                      -->
-<!--                                                                 -->
-<!-- Documentation of this file format can be found at:              -->
-<!-- http://docs.codehaus.org/display/JETTY/jetty.xml                -->
-<!--                                                                 -->
-<!-- =============================================================== -->
+<!-- ========================================================================= -->
+<!-- Configure the Jetty Server                                                -->
+<!--                                                                           -->
+<!-- Documentation of this file format can be found at:                        -->
+<!-- http://www.eclipse.org/jetty/documentation/current/jetty-xml-config.html  -->
+<!--                                                                           -->
+<!-- ========================================================================= -->
 
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
@@ -55,7 +57,7 @@
     <!-- =========================================================== -->
     <!-- Server Thread Pool                                          -->
     <!-- =========================================================== -->
-    <Set name="ThreadPool">
+    <Arg>
 
       <!-- PICK ONE -->
 
@@ -71,6 +73,9 @@
            http://trac.i2p2.i2p/ticket/1395
        -->
       <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
+        <Arg type="int">20</Arg>     <!-- maxThreads, overridden below -->
+        <Arg type="int">3</Arg>      <!-- minThreads, overridden below -->
+        <Arg type="int">60000</Arg>  <!-- maxIdleTimeMs, overridden below -->
         <Arg>
            <New class="java.util.concurrent.LinkedBlockingQueue">
               <Arg type="int">40</Arg>
@@ -78,43 +83,11 @@
         </Arg>
         <Set name="minThreads">3</Set>
         <Set name="maxThreads">20</Set>
-        <Set name="maxIdleTimeMs">60000</Set>
+        <Set name="idleTimeout">60000</Set>
         <Set name="daemon">true</Set>
         <Set name="name">Eepsite Jetty</Set>
       </New>
-
-      <!-- Optional Java 5 bounded threadpool with job queue 
-           Requests above the max will be rejected and logged.
-           High-traffic sites should increase maximumPoolSize.
-
-           Args are:
-             corePoolSize (should be at least 3)
-             maximumPoolSize
-             keepAliveTime (milliseconds)
-             timeout (TimeUnit)
-             queue (BlockingQueue)
-
-           Not recommended.
-           ref:
-           http://trac.i2p2.i2p/ticket/1395
-           http://docs.oracle.com/javase/6/docs/api/java/util/concurrent/ThreadPoolExecutor.html
-       -->
-     <!--
-      <New class="org.eclipse.jetty.util.thread.ExecutorThreadPool">
-        <Arg type="int">3</Arg>
-        <Arg type="int">20</Arg>
-        <Arg type="long">60000</Arg>
-        <Arg>
-            <Call class="java.util.concurrent.TimeUnit" name="valueOf" >
-                <Arg>MILLISECONDS</Arg>
-            </Call>
-        </Arg>
-        <Arg>
-            <New class="java.util.concurrent.SynchronousQueue" />
-        </Arg>
-      </New>
-     -->
-    </Set>
+    </Arg>
 
 
 
@@ -133,36 +106,31 @@
     -->    
     <Call name="addConnector">
       <Arg>
-          <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
+          <New class="org.eclipse.jetty.server.ServerConnector">
+            <Arg><Ref id="Server" /></Arg>
+            <Arg type="int">1</Arg>     <!-- number of acceptors -->
+            <Arg type="int">0</Arg>     <!-- default number of selectors -->
+            <Arg>
+              <Array type="org.eclipse.jetty.server.ConnectionFactory">    <!-- varargs so we need an array -->
+                <Item>
+                  <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                    <Arg>
+                      <New class="org.eclipse.jetty.server.HttpConfiguration">
+                        <Set name="sendServerVersion">false</Set>
+                        <Set name="sendDateHeader">true</Set>
+                      </New>
+                    </Arg>
+                  </New>
+                </Item>
+              </Array>
+            </Arg>
             <Set name="host">127.0.0.1</Set>
             <Set name="port">7658</Set>
-            <Set name="maxIdleTime">600000</Set>
-            <Set name="Acceptors">1</Set>
-            <Set name="statsOn">false</Set>
-	    <Set name="lowResourcesConnections">5000</Set>
-	    <Set name="lowResourcesMaxIdleTime">5000</Set>
-	    <Set name="useDirectBuffers">false</Set>
+            <Set name="idleTimeout">600000</Set>
           </New>
       </Arg>
     </Call>
 
-    <!-- Recommended to use this connector on Java 5, as
-         Jetty 6 and Java 5 NIO don't play well together.
-    -->
-    <!--
-    <Call name="addConnector">
-      <Arg>
-          <New class="org.eclipse.jetty.server.bio.SocketConnector">
-            <Set name="host">127.0.0.1</Set>
-            <Set name="port">7658</Set>
-            <Set name="maxIdleTime">600000</Set>
-            <Set name="Acceptors">1</Set>
-            <Set name="statsOn">false</Set>
-          </New>
-      </Arg>
-    </Call>
-    -->
-
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
     <!-- To add a HTTPS SSL listener                                     -->
     <!-- see jetty-ssl.xml to add an ssl connector. use                  -->
@@ -242,7 +210,7 @@
     <Ref id="DeploymentManager">
       <Call name="addAppProvider">
         <Arg>
-          <New class="org.eclipse.jetty.deploy.providers.ContextProvider">
+          <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
             <Set name="monitoredDirName">./eepsite/contexts</Set>
             <Set name="scanInterval">120</Set>
           </New>
@@ -332,8 +300,6 @@
     <!-- extra options                                               -->
     <!-- =========================================================== -->
     <Set name="stopAtShutdown">true</Set>
-    <Set name="sendServerVersion">false</Set>
-    <Set name="sendDateHeader">true</Set>
-    <Set name="gracefulShutdown">1000</Set>
+    <Set name="stopTimeout">1000</Set>
 
 </Configure>
diff --git a/installer/resources/hosts.txt b/installer/resources/hosts.txt
index 3af47e342..8a2cae375 100644
--- a/installer/resources/hosts.txt
+++ b/installer/resources/hosts.txt
@@ -221,7 +221,7 @@ romster.i2p=-~C1Usktw-Q8ESjPFLignsVpconze8xC10j2eIOTrSb4r0~5wYbb6NA~qPNfyPneK-wa
 marshmallow.i2p=99AaeKrGXmKPUaX256IeRqjvjOLmN4xZnUemTEwFAdanLDa0eMI2UitjrSoq6gy~cnZ06ctQ~ldlt4XhWAiPrFa5Ufxzx-8tT4r39djIG9~NuEHoQEv3qiScwtUVIeao9Bm9sxM1-MTmM~XmT5Y5s8SZkVqLCY2Qj0vg2ZSnbWM9nEk4JTqjFhxkMhBS4okQHYnTskqreOejJjYDdJAizt9pKq2t3TWFVJAxdSbDEqAvXO3sAwi2k9O-ctbMbmsnWFatkcTNB86NAqKtdPgC1CEaAeRmiF7hrksbcf82QJj0PQnh5ANgfe07GrEWuoSvXBYYGegUEXHA~D1GjnpAjncR429399stETBxJp5TLZsUTKDJU9YGIEIuJmhwC1NQyZFGAg2luroVFmhT9IfKrFefnsEZMyNdzM79Cm2hfdltLs0~7JMOrZYguJrvusdrjKllCYa2UmiBUXpY4sXMVwijlJvxUnodP21SerhtNdSzu~BoBq9t-hVrmW9VZJchAAAA
 openforums.i2p=9fTKl1CC1o2WrxBbE3fvr4xOUGse~qMjmhfn0lpDGXZ0Ohk55ocODIg0AFlPnQd4AchS0VFk0UyWqoZ7B93tyKfOypuVqHl7stucR6PSYMda9QKRlJugX9vwOKKMFOLnu5Xf5T7s7cKqSX8qUDdqeUjDPXyme~xYGhFyn4GftWURF0EesuhY4qP-GTQPEQef2f4DQmTKB1G62~WrRLd6AbvRBmZ4l0qSaKMd7FRjPhwmiXI9JhS~3gsKZ2DUP1Y7th4Lw77lnIdYVejxZ5ZU-PIYd2xnJK~WsazvRp2QOBPa8Vn8X6302IyAbR52zZEB50jucwK4oQ7FbP-Ws4bLA0WoTe1ZxYtDYLo1R5BUqie0cGP~fdc14oR-0NhAEz8VBnTQ4m9CMoz-oaT2R6xWaG4q5MH4671vULudbFeixz2NaGYjuiTO2rCcsvliCibn8sAA~SfRIk~hZF0ZkjyG0SAysVjO~qwjzDBVirSz5YOPp~ZdntbI5hQzjzMIhgxFAAAA
 bash.i2p=MsTeG5WIguhorKQ~9xUHVAMHOpia7Y09oid-7vCKS0titHeArGGoal48tkxVD30sXZjxTVBu4lkH9j4oPiQV30wpO0fkSMh1ryiIU1uOTLaAcbNtKCdCixpDchjjJKmxvnTa7LOc1Zft~XkS0ydsxwxsXa9uPU2G3H7WBacJ2v0zxLWyjjJnYIQoJCEHFZrzr~nJ58csCJP-TbJDRegz-0J5LrhZsjbNBFckGrLFtqbRmPwJkS2RU1Kx7SQ0hfN4eFvO7NvratDIo9j3q-OuXyHQm-1RS5XzL5ZxJFHYeaPWgKcLouWHp0MX1OKBnGitGGe1EPzmqf3LwgU8RIohLoFi3CaSc4eO3hYbKLShwz0fzNWFYUeQhLrtLPYA0~fq~lflXpeaXIPOHcJLST0GJd3uWGleS7iV4eXG4LvVlVEEDSYyNNoACmovQRtZOo-DHdUN~iRWy~skNBddX5-hTdAaQyk0ZsfLIF0-pBoWnFW8bFjOcXTF0nNOOgRzXSz9AAAA
-stats.i2p=Okd5sN9hFWx-sr0HH8EFaxkeIMi6PC5eGTcjM1KB7uQ0ffCUJ2nVKzcsKZFHQc7pLONjOs2LmG5H-2SheVH504EfLZnoB7vxoamhOMENnDABkIRGGoRisc5AcJXQ759LraLRdiGSR0WTHQ0O1TU0hAz7vAv3SOaDp9OwNDr9u902qFzzTKjUTG5vMTayjTkLo2kOwi6NVchDeEj9M7mjj5ySgySbD48QpzBgcqw1R27oIoHQmjgbtbmV2sBL-2Tpyh3lRe1Vip0-K0Sf4D-Zv78MzSh8ibdxNcZACmZiVODpgMj2ejWJHxAEz41RsfBpazPV0d38Mfg4wzaS95R5hBBo6SdAM4h5vcZ5ESRiheLxJbW0vBpLRd4mNvtKOrcEtyCvtvsP3FpA-6IKVswyZpHgr3wn6ndDHiVCiLAQZws4MsIUE1nkfxKpKtAnFZtPrrB8eh7QO9CkH2JBhj7bG0ED6mV5~X5iqi52UpsZ8gnjZTgyG5pOF8RcFrk86kHxAAAA
+stats.i2p=Okd5sN9hFWx-sr0HH8EFaxkeIMi6PC5eGTcjM1KB7uQ0ffCUJ2nVKzcsKZFHQc7pLONjOs2LmG5H-2SheVH504EfLZnoB7vxoamhOMENnDABkIRGGoRisc5AcJXQ759LraLRdiGSR0WTHQ0O1TU0hAz7vAv3SOaDp9OwNDr9u902qFzzTKjUTG5vMTayjTkLo2kOwi6NVchDeEj9M7mjj5ySgySbD48QpzBgcqw1R27oIoHQmjgbtbmV2sBL-2Tpyh3lRe1Vip0-K0Sf4D-Zv78MzSh8ibdxNcZACmZiVODpgMj2ejWJHxAEz41RsfBpazPV0d38Mfg4wzaS95R5hHx6eh7oG61KBN1cO1oY8M2oQfISCCpWHPm4WzOlfOHyZOzUHOpcYERAFbsO~w0-ryKIjZJeTzmc314vQB3gG8zMhPRWy9ff6BMkI492DQG2Qv0y3f5fRtx3BfzD7POhujoICzbs8XiCOuuAu8BO0u3k903uHAPNurZx~0jG05TdBQAEAAcAAA==
 luckypunk.i2p=cWFSoPjjQbtISkSzz2-dZf~ZlN1ZwTqG1DDEpcS3pOW8VzrOR6pQaUIQpzdx6MWa8tHplPlFiw~Y-KX6UlXfr557X7L9s-mld9hlQwAy4FGc6eGAe3XmtwKLLCHhmsTozea3nRE9nOIsPwntz7n~f1yu8PrkehzrMJfeqOIPA5teyyfxmeKwa3Jnr4YC8qc2EWSACgh-tAORnjVpMrByuFRaW-J~6cFBJ7gobC4aZfhIlcDFIt96VT4caUlsqKQjgQQ9k8oPrlbFsQHTmNB7331aapstQZ8WJsRIqkSLOUIGrE1XOzUFGthmk5urwcNcsOZmunlMtMRS2RN4rJp2aDFfr~wPGkh5QtueRAT1mSbn116qqRRo6PQvARZQk0oqtm97bqfqdb5SbELHJpbqpJLoAiNQywIgXwgFLP8LYJnQO64EreVIvOjhevZUav5kbQZVE41NjJcT5ZmDtQLHVA~gVsHiYe0KxTRoAOwrlsx~Z3vExq3I1Yd-vhS6ATA5AAAA
 i2p-bt.postman.i2p=pL4Xjp3RFu4trp35Z9kLrsOX~pqizwk6x6iydmx1JAjNdhzppPxUvix8NRLEu~n-LURObrsMX6mTF~VHWEDTBBCaxUw6y9NGvKeTRRtCirK6NXFQQIAo-STGIA3z6DPN4G5IGtVsOOKx0ucjh7rkHH0k7p4g4rxnbQ0S3XWSAOqeIpnK-pNQDCr~p9rd2PAGCQVsWLSlOJzUITTrQe2~w2by-eysIJXcO59iiXloj9O3JLY3Yzy3fjjjXHnXH5WeP5kbWOuufXBUF2A9mrEzQo1a0hZNb0bnVFevtdNLMuiB4cNxWE6UfBLZXmqwW2JNwFs799rxgpVEjUwJiYttv2tZoMdESOivlc3IZmYESWa~2LsO-23nOYx55X5nfpJ~HBqipgecTgS37F4GNa5m-d9FaMeAcBy23X-nBDFxCob3PMxBAQ9adpTZj-IE04RvSbara28tu4~cQ9KpzYeRQ7Mt-PPuKo4gzxMZUo4IL1aGXRBUb1U~Ph7Lh4r8LZc4AAAA
 tracker.postman.i2p=YRgrgTLGnbTq2aZOZDJQ~o6Uk5k6TK-OZtx0St9pb0G-5EGYURZioxqYG8AQt~LgyyI~NCj6aYWpPO-150RcEvsfgXLR~CxkkZcVpgt6pns8SRc3Bi-QSAkXpJtloapRGcQfzTtwllokbdC-aMGpeDOjYLd8b5V9Im8wdCHYy7LRFxhEtGb~RL55DA8aYOgEXcTpr6RPPywbV~Qf3q5UK55el6Kex-6VCxreUnPEe4hmTAbqZNR7Fm0hpCiHKGoToRcygafpFqDw5frLXToYiqs9d4liyVB-BcOb0ihORbo0nS3CLmAwZGvdAP8BZ7cIYE3Z9IU9D1G8JCMxWarfKX1pix~6pIA-sp1gKlL1HhYhPMxwyxvuSqx34o3BqU7vdTYwWiLpGM~zU1~j9rHL7x60pVuYaXcFQDR4-QVy26b6Pt6BlAZoFmHhPcAuWfu-SFhjyZYsqzmEmHeYdAwa~HojSbofg0TMUgESRXMw6YThK1KXWeeJVeztGTz25sL8AAAA
@@ -281,7 +281,7 @@ site.games.i2p=eIqE511k1CtMwCmGDhujbpNzW96m-4ebFNByE3TArJolQBpSBdxOc437G3QUcAAIz
 squid2.i2p=B~z60yTKwsevxmLVWw6tf5PChhYfZCRna~fJ0nq4dmxmu76p~QdgZUR5ywjFm5AfXOX5ifQD0VL4oKzyZyW-Ztvu0FPgH-IItgYv1oBOoLk22tTq-vraqH39VsauoywmHG8wLnyN85~Cq3Sz-~zwKACVKPPtAG1hR7w9R0rXev1QuSekydEXcaY2BAnWl~p56rAbPzHgC4NkjSPTEQJSNpQKHhLoCubA-qi2Dve7GrsIlH6aSuzIwodQIsjVFDsgbnpwlejk9kLMYldOL5Ed1S1RWC-KcFbB3a5mbGEBS0KyQMP3fDIEhbvlfNvoFHkzwY7EAcgavL8R4PUmNWEZ30FSU6HR-YhVC4Xi4bz9GfXCQpmKbmUmD2aUFn2Kz~MsJ9vpRVWJ4OfUEDJGTUrL2MStHG5alq6doLBMcUWMxXzocQI37SYVOg9GRD-G9lQMU2H3MQJF9liBlRt4hZg9nTfFsASO~eiDWXC9Aerk0H0~KcaMliUxtRyQ6mnhBsbPAAAA
 striker.i2p=IiXUTuW3m7SvKxMQ~PD63h8PStz26D99k0vyWIDqLOsGhMpSDIaP~a~V0r2HgKe5bFNXjf4RXXrNV7yTTTEGGCEbuAjUTaadD~auhxQbosxY0yz7Hy4CFYJN2Drl~fg~NnSXBajqgNPqxAr3XWfnPdYnuz5BpUR6rybnimoQr2lWrL8qboXUynpaRHmuaLEIkO4GLjZofEraF2nsJyLOcgeISFxTIbNo2b2qDqZ7fNuQhkSZSEFRfRPf9A1UtInMxXWQO~1wWodgtqtiKvUPMY3j3ktwC~ST1UR0GnVnrWCOOE50wjJnuCuhUFNL~u0xx9lzljhc31GzI-UbIZEqHjvg84z1VjGGd4sLsR8X9fdWh6mO5eXHuQkUivkezu0RUhEN-uicZVIyohicc6OzVE1e7MQyG5x3~mR9kMCCEIAYk~mxAMl0Q4~1rjBEplroCwX~~flf-BgGhk3MOpD8xbxKhv~7TY6NqO40~t4ENbOp7mn2Y6~pvrAJ-WIp9K2rAAAA
 tracker.awup.i2p=6thxoytwv2wsiW5opvUc9GwO0v2kIlmvJH4Gm5-L3v~9joCsn7~fjIGZWi1MGNFckrgTIrqgIZqbRtNYovKamsa5vFHJ~UbrpNxKsxI9ag1d25~M~xKgcBart2NCqzUUmNDHH6eDGQpy0n0sOIzt23uN-yvd1Cpy2ObZFIf9~b5oHZUxH5kn5vEMINgtzjdracIwfYpJC2nUqK6~SI~T9lSd1y2pdsFEO0WQDO95cP2f66MY59MqJ9L3JVA9oNRohUSdbyCU8-n8kjJKDdc0hrM0loOm8hnvH78Q2JKD4VwVP1LJcnYy96boqb0nBQ9aJqb3CxHbMTBr0bb4LcEAF4eF-YvMTR8zrveAhOdMfucfqNZtejND0OOhvEHCXG8UoAEdJsdQGRbnGu9zaXdr1dWiqYaPmWEkZCToN-wjWGH-nEXimJ3S9TqGhDaxnjyV2LmJW8fqQaBXz22yHOIcBeZlShGKTzfZ~XN~-xGo~G~1-SUdjcTAoNluhkiUuRYCAAAA
-zzz.i2p=GKapJ8koUcBj~jmQzHsTYxDg2tpfWj0xjQTzd8BhfC9c3OS5fwPBNajgF-eOD6eCjFTqTlorlh7Hnd8kXj1qblUGXT-tDoR9~YV8dmXl51cJn9MVTRrEqRWSJVXbUUz9t5Po6Xa247Vr0sJn27R4KoKP8QVj1GuH6dB3b6wTPbOamC3dkO18vkQkfZWUdRMDXk0d8AdjB0E0864nOT~J9Fpnd2pQE5uoFT6P0DqtQR2jsFvf9ME61aqLvKPPWpkgdn4z6Zkm-NJOcDz2Nv8Si7hli94E9SghMYRsdjU-knObKvxiagn84FIwcOpepxuG~kFXdD5NfsH0v6Uri3usE3uSzpWS0EHmrlfoLr5uGGd9ZHwwCIcgfOATaPRMUEQxiK9q48PS0V3EXXO4-YLT0vIfk4xO~XqZpn8~PW1kFe2mQMHd7oO89yCk-3yizRG3UyFtI7-mO~eCI6-m1spYoigStgoupnC3G85gJkqEjMm49gUjbhfWKWI-6NwTj0ZnAAAA
+zzz.i2p=GKapJ8koUcBj~jmQzHsTYxDg2tpfWj0xjQTzd8BhfC9c3OS5fwPBNajgF-eOD6eCjFTqTlorlh7Hnd8kXj1qblUGXT-tDoR9~YV8dmXl51cJn9MVTRrEqRWSJVXbUUz9t5Po6Xa247Vr0sJn27R4KoKP8QVj1GuH6dB3b6wTPbOamC3dkO18vkQkfZWUdRMDXk0d8AdjB0E0864nOT~J9Fpnd2pQE5uoFT6P0DqtQR2jsFvf9ME61aqLvKPPWpkgdn4z6Zkm-NJOcDz2Nv8Si7hli94E9SghMYRsdjU-knObKvxiagn84FIwcOpepxuG~kFXdD5NfsH0v6Uri3usE3XWD7Pw6P8qVYF39jUIq4OiNMwPnNYzy2N4mDMQdsdHO3LUVh~DEppOy9AAmEoHDjjJxt2BFBbGxfdpZCpENkwvmZeYUyNCCzASqTOOlNzdpne8cuesn3NDXIpNnqEE6Oe5Qm5YOJykrX~Vx~cFFT3QzDGkIjjxlFBsjUJyYkFjBQAEAAcAAA==
 decadence.i2p=w8wa88TQU3yHYS35iYud~6z7Bo7brwkQi0q1s9njx2GdNW~~XyLB9r3Wz6qFnmMsnCQPXoaX3NRBhmzMTGdN5pyPR8zlfQAsUEgoK4SnBhYXYMnuSUzFwAFtoRTCljcR-ooy5FLojFg1ugIzbLOEiHhfcxBcdp2~Y2Po~2EdIOX7bZiFOuA8fYriqm7QJ1Nul2k2fuo5SVS9EGf2HwxAKo6sOqSjfbXuTJFacWfD-qmspOxgbb~tHOvVhwESb~zqhEsS7EOG8AqpJbhgB05U1ho9YoDFrNm1pc4XQvkncRJGpmiwq3vpVcpH8h-1dpUWTRaU7WK9C36dQVg4dybVcFypemEHbPjNVH0AYWVnZL1mrsxcumgyDEkN46vPqI7Oi86V92tf~fjoYBZ76C3MfMPWDVeDnR-BHIoBENsD7~-YRAhA6qW56arYmRBfvE3oQgI7~DA3PMAPjxclI5T~M7pcaeAUXYo~sWn7K9yKBZqT05rk-mpivo-PbUALXWwNAAAA
 freedomarchives.i2p=jeW1zGABf~72chhz79UkY0yiXi7dSb9jnmmJvWnwlhO6vurwsDbi7j6D8XReYzcqZGP0i-IsX~dLFRlWB5cbsFd7Jw-zCSuHSCsuk6h1E9rQqssCXxM~bSBajlJ9CSaqNaxaUr~M4GwI9M9XuCtqD5ngPYLG0BN-TSQCr2~T4HeQbV68g9XScO0qhlpa3H4kwY~aetKOHYtF0y3OFdXkeHQTmPkz2kET4mW4rbwxwX9k95ji-5DL0lLDLlpnmHHRyOgN0ewJVdUOcwirvHmyE3kdq9N~iDyxPVBM2-rluQlXvtI0i481PG6rFIPotHnmkvHlELjSbYluoBrTVqZs8RI3mTfuHLV1neATcysXythw9cr5tAHmHcqDTsDKxPqQsxpnFq23oHK4qCTV103825fxr7x~eUQVqDIu8UGCBc7D~yel50cYjPyjRPKzrNY7Yfh5nSGu~7-2muzUqJXAR050RlJ~0h73KliJwcXnmLnHgderKScWwfor3iLl3jupAAAA
 closedshop.i2p=lyY-w-dF4YnT9x-iQNkHmuJnjtbB-rqdVPIoRPxcyz0nc1tQjb6cgVTY~3IOEybrYM1mWevNdqR~B3LZ~fy8dvgTB8cp-zWkf83-BwZiwf9W~4Y34R20sBkyPsfYiD-plDqr8JoTm-SH03e5j9wqg9vh0dHmpHeGG348YH-vkA4l4fQyKXorVrW5vMRSTXvcNpzDU-6IrG1Gyn3EfoVuNu0tJv2dzm2R45CJmtPozRCfBt776Y6VIQ1HnBRwQjGANjd6DPMP3CJDM2aTp8IkQsj02yAwR8wq-BQhMTiBvmLgVns8ylCKEJuPRQMaPKRtEb64qRmX1oxHsby6WWH4xDwZgAjs1Qpqe~qAu4f8AFHny1l9uhNBfZrPnvb4iScMmu6BputERR7FLm8a8KJaNBk70dxJSYw0v5JJ-pbKj2cOpeTR61oWdF2MmFgaFCqBhTLl91zaNI~vi2nALkcuxfQ3thRQaLlXxIQ1KdarS9Rfe6BLpKk36syi9e-Xuj5hAAAA
@@ -311,7 +311,7 @@ de-ebook-archiv.i2p=E71FRom6PZNEqTN2Lr8P-sr23b7HJVC32KoGnVQjaX6zJiXwhJy2HsXob36Q
 galen.i2p=5jpwQMI5FT303YwKa5Rd38PYSX04pbIKgTaKQsWbqoWjIfoancFdWCShXHLI5G5ofOb0Xu11vl2VEMyPsg1jUFYSVnu4-VfMe3y4TKTR6DTpetWrnmEK6m2UXh91J5DZJAKlgmO7UdsFlBkQfR2rY853-DfbJtQIFl91tbsmjcA5CGQi4VxMFyIkBzv-pCsuLQiZqOwWasTlnzey8GcDAPG1LDcvfflGV~6F5no9mnuisZPteZKlrv~~TDoXTj74QjByWc4EOYlwqK8sbU9aOvz~s31XzErbPTfwiawiaZ0RUI-IDrKgyvmj0neuFTWgjRGVTH8bz7cBZIc3viy6ioD-eMQOrXaQL0TCWZUelRwHRvgdPiQrxdYQs7ixkajeHzxi-Pq0EMm5Vbh3j3Q9kfUFW3JjFDA-MLB4g6XnjCbM5J1rC0oOBDCIEfhQkszru5cyLjHiZ5yeA0VThgu~c7xKHybv~OMXION7V8pBKOgET7ZgAkw1xgYe3Kkyq5syAAAA
 tracker.mastertracker.i2p=VzXD~stRKbL3MOmeTn1iaCQ0CFyTmuFHiKYyo0Rd~dFPZFCYH-22rT8JD7i-C2xzYFa4jT5U2aqHzHI-Jre4HL3Ri5hFtZrLk2ax3ji7Qfb6qPnuYkuiF2E2UDmKUOppI8d9Ye7tjdhQVCy0izn55tBaB-U7UWdcvSK2i85sauyw3G0Gfads1Rvy5-CAe2paqyYATcDmGjpUNLoxbfv9KH1KmwRTNH6k1v4PyWYYnhbT39WfKMbBjSxVQRdi19cyJrULSWhjxaQfJHeWx5Z8Ev4bSPByBeQBFl2~4vqy0S5RypINsRSa3MZdbiAAyn5tr5slWR6QdoqY3qBQgBJFZppy-3iWkFqqKgSxCPundF8gdDLC5ddizl~KYcYKl42y9SGFHIukH-TZs8~em0~iahzsqWVRks3zRG~tlBcX2U3M2~OJs~C33-NKhyfZT7-XFBREvb8Szmd~p66jDxrwOnKaku-G6DyoQipJqIz4VHmY9-y5T8RrUcJcM-5lVoMpAAAA
 codevoid.i2p=tV-4GJjgYIoCDTTJ91nfDbhSnT8B2o3v-TUfHtiAAjJJdroCAEDbmJWFPUQJEEispvrjNe~fP7VAYkk9fAhSrmdBLtEGB3NUESdiZEPsDtKJBdxijPGb1erZF2Z6eYHoK-t5g7MWWTsgLz~4xn211Jpfa-T4pqL2tcjsa7ixsaMpHF8NXFrITdyxSJRPz8OnHYgDR~ULFyzroi255MpiSUBzGcUZEiQSFLHLhjT5D5tP~gfJirFnfgOHvzWBK9L7y91qY~gYvM2eDcxMxq4Ac1gw0JeahkzAk3j6Spco3LHW3bJvELopf1QmLFu3nfPaegH1Hejt9AhXEH~FV-~M9F1BePipcIYlm7nKyre3aVPLYDZSCvkUx~8nnD3HEpMijD8fdfqSFPU7aZQe19a7rZJUbX~a4M3rBDO-C4uAid6Uznb1tLu2XR1GVVITGHaLwmumImXjlU~1nEnluBQB6iBQPZ9xJccArlYgWSooR9gpyN93PwTPsPe5cPkxCFuxAAAA
-echelon.i2p=w6zK9m4fqSfvJck9EGIR1wRIbWsEQ2DkjZ-VI57ESFqLqbTIA1cD5nOfSSbpELqPyhjifdrNiBNAsSdyil3C0a2B7CGtwUcTS2dCG0tKf2nAbvpsbcCK17nI4Xbu5KqZU0y3hJ~l7rcJqQBR0nfV5cU30ZDrpQV6VL875cihGlnmwLFq6qSzNcEb88Nw6wFG~FIgB2PJ6A3jJyuTnLrdiMvwqgD6nSyeOylOgBCsNxXh8-drrhASjladfNrwjlGRCZTiQ~H92HIyOwiabDiG3TUugMaFWs87yuXnZ~ni9jgjoAMFo8xV8Od2BiRgCxkZoMU07FhgUjew9qtXNa04wkexf3gx77nVPhqE0GHqCuwHwmBVf92RdYEys76u~akaOMq5UhayDpCBCaHiYLkKDNqmh47tfMCwxf6z8VIcR4zv25QfJDIWPs~RA~9U7m4raytiAs5PvYZBn4B3SqOL8XdkL9sDT54sQXbsYCJr3olu6ieMtNWlmos0uohYXNUyAAAA
+echelon.i2p=w6zK9m4fqSfvJck9EGIR1wRIbWsEQ2DkjZ-VI57ESFqLqbTIA1cD5nOfSSbpELqPyhjifdrNiBNAsSdyil3C0a2B7CGtwUcTS2dCG0tKf2nAbvpsbcCK17nI4Xbu5KqZU0y3hJ~l7rcJqQBR0nfV5cU30ZDrpQV6VL875cihGlnmwLFq6qSzNcEb88Nw6wFG~FIgB2PJ6A3jJyuTnLrdiMvwqgD6nSyeOylOgBCsNxXh8-drrhASjladfNrwjlGRCZTiQ~H92HIyOwiabDiG3TUugMaFWs87yuXnZ~ni9jgjoAMFo8xV8Od2BiRgCxkZoMU07FhgUjew9qtXNa04whjq5e~DpHSVkT1aV-EgUmSnMbN6877xBX3lCYOaoXTXJK7B88uLifbqzO-JhbcB-fjnvcMpqUPPBZFKU2YKukLFWwMnUzeJtEYN0R0mt8P55dqTchR0g06IbiGLGLUzmnephGCeopeNBcpOvFJ34Ke5dJs9G5YS-lOIWLCqzAiqBQAEAAcAAA==
 crstrack.i2p=b4G9sCdtfvccMAXh~SaZrPqVQNyGQbhbYMbw6supq2XGzbjU4NcOmjFI0vxQ8w1L05twmkOvg5QERcX6Mi8NQrWnR0stLExu2LucUXg1aYjnggxIR8TIOGygZVIMV3STKH4UQXD--wz0BUrqaLxPhrm2Eh9Hwc8TdB6Na4ShQUq5Xm8D4elzNUVdpM~RtChEyJWuQvoGAHY3ppX-EJJLkiSr1t77neS4Lc-KofMVmgI9a2tSSpNAagBiNI6Ak9L1T0F9uxeDfEG9bBSQPNMOSUbAoEcNxtt7xOW~cNOAyMyGydwPMnrQ5kIYPY8Pd3XudEko970vE0D6gO19yoBMJpKx6Dh50DGgybLQ9CpRaynh2zPULTHxm8rneOGRcQo8D3mE7FQ92m54~SvfjXjD2TwAVGI~ae~n9HDxt8uxOecAAvjjJ3TD4XM63Q9TmB38RmGNzNLDBQMEmJFpqQU8YeuhnS54IVdUoVQFqui5SfDeLXlSkh4vYoMU66pvBfWbAAAA
 tracker2.postman.i2p=lnQ6yoBTxQuQU8EQ1FlF395ITIQF-HGJxUeFvzETLFnoczNjQvKDbtSB7aHhn853zjVXrJBgwlB9sO57KakBDaJ50lUZgVPhjlI19TgJ-CxyHhHSCeKx5JzURdEW-ucdONMynr-b2zwhsx8VQCJwCEkARvt21YkOyQDaB9IdV8aTAmP~PUJQxRwceaTMn96FcVenwdXqleE16fI8CVFOV18jbJKrhTOYpTtcZKV4l1wNYBDwKgwPx5c0kcrRzFyw5~bjuAKO~GJ5dR7BQsL7AwBoQUS4k1lwoYrG1kOIBeDD3XF8BWb6K3GOOoyjc1umYKpur3G~FxBuqtHAsDRICkEbKUqJ9mPYQlTSujhNxiRIW-oLwMtvayCFci99oX8MvazPS7~97x0Gsm-onEK1Td9nBdmq30OqDxpRtXBimbzkLbR1IKObbg9HvrKs3L-kSyGwTUmHG9rSQSoZEvFMA-S0EXO~o4g21q1oikmxPMhkeVwQ22VHB0-LZJfmLr4SAAAA
 nibble.i2p=V2XQ31BQWcwLcBNz2ywb4xy0Q1GMjdziQyjKql-lGdYPOX7w9g3j8IkA1jfW6YYwNi5QZc0JurjrSNH1yx6Y1goI8SB1l-yWdzst73fGWo6B1UtL45XrfXPg5k34RpktCNa4KoeIsUnGnxHQESSj5hw389hvexKXlkAHXQg9eUfbBYyzZc~~Kt4YdYX4cfMpXXjg443kyEiwKisOaRuiEN-YjqZ8pJTyAQsOKNg8hL3e15XFNPfAAkCSsALPAqj0~HZDwCZDeV0Cp4iaCGjw8tsNQ7xBeSjnhOeMoZKtrPAbbK4vNh7OIcakcVu16ykfEf-FcqbPQQe9rjilMy8V-BcjhggjUcZmtWj9qE7RMfUFpbAIfNHgWXTl5yR5V~brqxxuBxHQWn4oyB5NpY02dBkvvxXwdk~XFzXlSz~uEZKVswvI8rUHR4a2N3YDss5iQ~uscvKwNvsTZiDUaN66~CacZLYU9BtDBNnAxClz9LSu5b9CiunKeacbH6l5qrPpAAAA
diff --git a/installer/resources/locale-man/man_it.po b/installer/resources/locale-man/man_it.po
index 5d1afd9ab..e0a9ef37d 100644
--- a/installer/resources/locale-man/man_it.po
+++ b/installer/resources/locale-man/man_it.po
@@ -23,7 +23,7 @@ msgstr ""
 #: man/eepget.1:1
 #, no-wrap
 msgid "EEPGET"
-msgstr ""
+msgstr "EEPGET"
 
 #. type: TH
 #: man/eepget.1:1 man/i2prouter.1:1 man/i2prouter-nowrapper.1:1
@@ -46,7 +46,7 @@ msgstr "NOME"
 #. type: Plain text
 #: man/eepget.1:5
 msgid "Eepget - I2P downloader"
-msgstr ""
+msgstr "Eepget - Downloader I2P"
 
 #. type: SH
 #: man/eepget.1:6 man/i2prouter.1:6 man/i2prouter-nowrapper.1:6
@@ -57,7 +57,7 @@ msgstr "SINOSSI"
 #. type: Plain text
 #: man/eepget.1:9
 msgid "B<eepget> [I<options>]I<URL>"
-msgstr ""
+msgstr "B<eepget> [I<opzioni>]I<URL>"
 
 #. type: SH
 #: man/eepget.1:11 man/i2prouter.1:11 man/i2prouter-nowrapper.1:10
@@ -113,7 +113,7 @@ msgstr ""
 #. type: Plain text
 #: man/eepget.1:37
 msgid "B<-h> name=value"
-msgstr ""
+msgstr "B<-h> nome=valore"
 
 #. type: TP
 #: man/eepget.1:37
@@ -239,7 +239,7 @@ msgstr ""
 #: man/eepget.1:94 man/i2prouter.1:54 man/i2prouter-nowrapper.1:24
 #, no-wrap
 msgid "REPORTING BUGS"
-msgstr ""
+msgstr "SEGNALAZIONE BUG"
 
 #. type: Plain text
 #: man/eepget.1:99 man/i2prouter.1:59 man/i2prouter-nowrapper.1:29
@@ -252,7 +252,7 @@ msgstr ""
 #: man/eepget.1:100 man/i2prouter.1:60 man/i2prouter-nowrapper.1:30
 #, no-wrap
 msgid "SEE ALSO"
-msgstr ""
+msgstr "VEDI ANCHE"
 
 #. type: Plain text
 #: man/eepget.1:104
@@ -268,7 +268,7 @@ msgstr "I2PROUTER"
 #. type: Plain text
 #: man/i2prouter.1:5
 msgid "i2prouter - start and stop the I2P router"
-msgstr ""
+msgstr "i2prouter - lancia e termina il router I2P"
 
 #. type: Plain text
 #: man/i2prouter.1:9
@@ -280,7 +280,7 @@ msgstr ""
 #. type: Plain text
 #: man/i2prouter.1:13
 msgid "Control the I2P service."
-msgstr ""
+msgstr "Permette di controllare il servizio I2P."
 
 #. type: IP
 #: man/i2prouter.1:15
@@ -302,7 +302,7 @@ msgstr "B<start>"
 #. type: Plain text
 #: man/i2prouter.1:21
 msgid "Starts the I2P service."
-msgstr ""
+msgstr "Avvia il servizio I2P."
 
 #. type: IP
 #: man/i2prouter.1:23
@@ -313,7 +313,7 @@ msgstr "B<stop>"
 #. type: Plain text
 #: man/i2prouter.1:25
 msgid "Stops the I2P service."
-msgstr ""
+msgstr "Arresta il servizio I2P."
 
 #. type: IP
 #: man/i2prouter.1:27
@@ -324,7 +324,7 @@ msgstr "B<restart>"
 #. type: Plain text
 #: man/i2prouter.1:29
 msgid "Stops the I2P service and then starts it."
-msgstr ""
+msgstr "Arresta e poi riavvia il servizio I2P."
 
 #. type: IP
 #: man/i2prouter.1:31
@@ -379,7 +379,7 @@ msgstr "B<status>"
 #. type: Plain text
 #: man/i2prouter.1:49
 msgid "Prints whether the I2P service is running."
-msgstr ""
+msgstr "Scrive se il servizio I2P è in esecuzione."
 
 #. type: IP
 #: man/i2prouter.1:51
@@ -401,12 +401,12 @@ msgstr "B<i2prouter-nowrapper>(1)"
 #: man/i2prouter-nowrapper.1:1
 #, no-wrap
 msgid "I2PROUTER-NOWRAPPER"
-msgstr ""
+msgstr "I2PROUTER-NOWRAPPER"
 
 #. type: Plain text
 #: man/i2prouter-nowrapper.1:5
 msgid "i2prouter-nowrapper - start the I2P router"
-msgstr ""
+msgstr "i2prouter-nowrapper - avvia il router I2P"
 
 #. type: Plain text
 #: man/i2prouter-nowrapper.1:8
diff --git a/installer/resources/locale-man/man_ko.po b/installer/resources/locale-man/man_ko.po
index b963e23dd..2b53104db 100644
--- a/installer/resources/locale-man/man_ko.po
+++ b/installer/resources/locale-man/man_ko.po
@@ -6,12 +6,13 @@
 # 
 # Translators:
 # SEPT____ <xpressengine3@mail.beo.kr>, 2017
+# HelloKS <kqwe1859@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P man pages\n"
 "POT-Creation-Date: 2017-01-26 15:24+0000\n"
 "PO-Revision-Date: 2017-01-26 15:24+0000\n"
-"Last-Translator: SEPT____ <xpressengine3@mail.beo.kr>, 2017\n"
+"Last-Translator: HelloKS <kqwe1859@gmail.com>, 2017\n"
 "Language-Team: Korean (https://www.transifex.com/otf/teams/12694/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,7 +58,7 @@ msgstr "SYNOPSIS"
 #. type: Plain text
 #: man/eepget.1:9
 msgid "B<eepget> [I<options>]I<URL>"
-msgstr ""
+msgstr "B<eepget> [I<options>]I<URL>"
 
 #. type: SH
 #: man/eepget.1:11 man/i2prouter.1:11 man/i2prouter-nowrapper.1:10
@@ -94,7 +95,7 @@ msgstr "옵션"
 #. type: Plain text
 #: man/eepget.1:25
 msgid "B<-c>"
-msgstr ""
+msgstr "B<-c>"
 
 #. type: TP
 #: man/eepget.1:25
@@ -105,7 +106,7 @@ msgstr "기존 네트워크. 프록시를 쓰지 않음. B<-p> :0 와 동일."
 #. type: Plain text
 #: man/eepget.1:31
 msgid "B<-e> etag"
-msgstr ""
+msgstr "B<-e> etag"
 
 #. type: TP
 #: man/eepget.1:31
@@ -116,7 +117,7 @@ msgstr "요청 헤더에 etag 값을 세팅."
 #. type: Plain text
 #: man/eepget.1:37
 msgid "B<-h> name=value"
-msgstr ""
+msgstr "B<-h> name=value"
 
 #. type: TP
 #: man/eepget.1:37
@@ -127,7 +128,7 @@ msgstr "세팅된 name과 value로 요청 헤더를 추가"
 #. type: Plain text
 #: man/eepget.1:43
 msgid "B<-l> lineLen"
-msgstr ""
+msgstr "B<-l> lineLen"
 
 #. type: TP
 #: man/eepget.1:43
@@ -140,7 +141,7 @@ msgstr "진행 디스플레이를 컨트롤. B<\\ lineLen >를 통해 문자 당
 #. type: Plain text
 #: man/eepget.1:49
 msgid "B<-m> markSize"
-msgstr ""
+msgstr "B<-m> markSize"
 
 #. type: TP
 #: man/eepget.1:49
@@ -154,7 +155,7 @@ msgstr ""
 #. type: Plain text
 #: man/eepget.1:55
 msgid "B<-n> retries"
-msgstr ""
+msgstr "B<-n> retries"
 
 #. type: TP
 #: man/eepget.1:55
@@ -167,7 +168,7 @@ msgstr "다운로드가 실패했을 때 몇변 다시 시도할지 설정. 옵
 #. type: Plain text
 #: man/eepget.1:61
 msgid "B<-o> file"
-msgstr ""
+msgstr "B<-o> file"
 
 #. type: TP
 #: man/eepget.1:61
@@ -180,7 +181,7 @@ msgstr "파일의 이름을 설정합니다. 세팅되지 않으면, URL에 표
 #. type: Plain text
 #: man/eepget.1:67
 msgid "B<-p> proxy_host[:port]"
-msgstr ""
+msgstr "B<-p> proxy_host[:port]"
 
 #. type: TP
 #: man/eepget.1:67
@@ -196,7 +197,7 @@ msgstr ""
 #. type: Plain text
 #: man/eepget.1:73
 msgid "B<-t> seconds"
-msgstr ""
+msgstr "B<-t> seconds"
 
 #. type: TP
 #: man/eepget.1:73
@@ -207,7 +208,7 @@ msgstr "타임아웃 시간을 설정. 기본값은 60 초."
 #. type: Plain text
 #: man/eepget.1:79
 msgid "B<-u> username"
-msgstr ""
+msgstr "B<-u> username"
 
 #. type: TP
 #: man/eepget.1:79
@@ -218,7 +219,7 @@ msgstr "프록시 인증에 필요한 유저네임 세팅. 필요할 때만 입
 #. type: Plain text
 #: man/eepget.1:85
 msgid "B<-x> password"
-msgstr ""
+msgstr "B<-x> password"
 
 #. type: TP
 #: man/eepget.1:85
@@ -232,49 +233,49 @@ msgstr "프록시 인증에 필요한 비밀번호 세팅. 필요할 때만 입
 #: man/eepget.1:89
 #, no-wrap
 msgid "EXIT STATUS"
-msgstr ""
+msgstr "EXIT STATUS"
 
 #. type: Plain text
 #: man/eepget.1:93
 msgid ""
 "B<eepget> exits with status zero upon successful transfer and non-zero if "
 "there were problems with the download."
-msgstr ""
+msgstr "B<eepget>은 정상적인 전송때에는 0 상태로 종료되며 다운로드에 문제가 있을 때는 0이 아닙니다."
 
 #. type: SH
 #: man/eepget.1:94 man/i2prouter.1:54 man/i2prouter-nowrapper.1:24
 #, no-wrap
 msgid "REPORTING BUGS"
-msgstr ""
+msgstr "REPORTING BUGS"
 
 #. type: Plain text
 #: man/eepget.1:99 man/i2prouter.1:59 man/i2prouter-nowrapper.1:29
 msgid ""
 "Please enter a ticket on E<.UR https://trac.i2p2.de/> the I2P trac page "
 "E<.UE .>"
-msgstr ""
+msgstr "E<.UR https://trac.i2p2.de/> I2P trac 페이지 E<.UE .>에 티켓을 남겨 주세요"
 
 #. type: SH
 #: man/eepget.1:100 man/i2prouter.1:60 man/i2prouter-nowrapper.1:30
 #, no-wrap
 msgid "SEE ALSO"
-msgstr ""
+msgstr "SEE ALSO"
 
 #. type: Plain text
 #: man/eepget.1:104
 msgid "B<i2prouter>(1)  B<curl>(1)  B<wget>(1)"
-msgstr ""
+msgstr "B<i2prouter>(1)  B<curl>(1)  B<wget>(1)"
 
 #. type: TH
 #: man/i2prouter.1:1
 #, no-wrap
 msgid "I2PROUTER"
-msgstr ""
+msgstr "I2PROUTER"
 
 #. type: Plain text
 #: man/i2prouter.1:5
 msgid "i2prouter - start and stop the I2P router"
-msgstr ""
+msgstr "i2prouter - I2P 라우터를 시작하거나 중지할 때 사용"
 
 #. type: Plain text
 #: man/i2prouter.1:9
@@ -282,142 +283,144 @@ msgid ""
 "B<i2prouter> "
 "{I<console>|I<start>|I<stop>|I<graceful>|I<restart>|I<condrestart>|I<status>|I<dump>|I<install>|I<remove>}"
 msgstr ""
+"B<i2prouter> "
+"{I<console>|I<start>|I<stop>|I<graceful>|I<restart>|I<condrestart>|I<status>|I<dump>|I<install>|I<remove>}"
 
 #. type: Plain text
 #: man/i2prouter.1:13
 msgid "Control the I2P service."
-msgstr ""
+msgstr "I2P 서비스를 조정"
 
 #. type: IP
 #: man/i2prouter.1:15
 #, no-wrap
 msgid "B<console>"
-msgstr ""
+msgstr "B<console>"
 
 #. type: Plain text
 #: man/i2prouter.1:17
 msgid "Runs I2P as a console application under the current user."
-msgstr ""
+msgstr "현재 유저로 I2P를 콘솔 애플리케이션으로 동작시킴"
 
 #. type: IP
 #: man/i2prouter.1:19
 #, no-wrap
 msgid "B<start>"
-msgstr ""
+msgstr "B<start>"
 
 #. type: Plain text
 #: man/i2prouter.1:21
 msgid "Starts the I2P service."
-msgstr ""
+msgstr "I2P 서비스를 시작"
 
 #. type: IP
 #: man/i2prouter.1:23
 #, no-wrap
 msgid "B<stop>"
-msgstr ""
+msgstr "B<stop>"
 
 #. type: Plain text
 #: man/i2prouter.1:25
 msgid "Stops the I2P service."
-msgstr ""
+msgstr "I2P 서비스를 중지"
 
 #. type: IP
 #: man/i2prouter.1:27
 #, no-wrap
 msgid "B<restart>"
-msgstr ""
+msgstr "B<restart>"
 
 #. type: Plain text
 #: man/i2prouter.1:29
 msgid "Stops the I2P service and then starts it."
-msgstr ""
+msgstr "I2P 서비스를 종료하고 재시작"
 
 #. type: IP
 #: man/i2prouter.1:31
 #, no-wrap
 msgid "B<condrestart>"
-msgstr ""
+msgstr "B<condrestart>"
 
 #. type: Plain text
 #: man/i2prouter.1:33
 msgid "Restart the I2P service only if it is already running."
-msgstr ""
+msgstr "I2P 서비스가 실행중이라면 재시작"
 
 #. type: IP
 #: man/i2prouter.1:35
 #, no-wrap
 msgid "B<graceful>"
-msgstr ""
+msgstr "B<graceful>"
 
 #. type: Plain text
 #: man/i2prouter.1:37
 msgid "Stop I2P gracefully (may take up to 11 minutes)"
-msgstr ""
+msgstr "우아하게 종료 (11분 이상 걸릴 수 있음)"
 
 #. type: IP
 #: man/i2prouter.1:39
 #, no-wrap
 msgid "B<install>"
-msgstr ""
+msgstr "B<install>"
 
 #. type: Plain text
 #: man/i2prouter.1:41
 msgid "Install initscript to start I2P automatically when the system boots."
-msgstr ""
+msgstr "시스템이 켜짐젼 I2P를 자동 시작하게끔 initscript를 설치"
 
 #. type: IP
 #: man/i2prouter.1:43
 #, no-wrap
 msgid "B<remove>"
-msgstr ""
+msgstr "B<remove>"
 
 #. type: Plain text
 #: man/i2prouter.1:45
 msgid "Uninstall initscript that was installed with B<install>"
-msgstr ""
+msgstr "B<install>로 설치된 initscript를 삭제"
 
 #. type: IP
 #: man/i2prouter.1:47
 #, no-wrap
 msgid "B<status>"
-msgstr ""
+msgstr "B<status>"
 
 #. type: Plain text
 #: man/i2prouter.1:49
 msgid "Prints whether the I2P service is running."
-msgstr ""
+msgstr "I2P 작동 여부를 출력"
 
 #. type: IP
 #: man/i2prouter.1:51
 #, no-wrap
 msgid "B<dump>"
-msgstr ""
+msgstr "B<dump>"
 
 #. type: Plain text
 #: man/i2prouter.1:53
 msgid "Dumps the current threads into B<wrapper.log>."
-msgstr ""
+msgstr "B<wrapper.log>에 현재 쓰레드를 덤프"
 
 #. type: Plain text
 #: man/i2prouter.1:61
 msgid "B<i2prouter-nowrapper>(1)"
-msgstr ""
+msgstr "B<i2prouter-nowrapper>(1)"
 
 #. type: TH
 #: man/i2prouter-nowrapper.1:1
 #, no-wrap
 msgid "I2PROUTER-NOWRAPPER"
-msgstr ""
+msgstr "I2PROUTER-NOWRAPPER"
 
 #. type: Plain text
 #: man/i2prouter-nowrapper.1:5
 msgid "i2prouter-nowrapper - start the I2P router"
-msgstr ""
+msgstr "i2prouter-nowrapper - I2P 라우터를 시작"
 
 #. type: Plain text
 #: man/i2prouter-nowrapper.1:8
 msgid "B<i2prouter-nowrapper>"
-msgstr ""
+msgstr "B<i2prouter-nowrapper>"
 
 #. type: Plain text
 #: man/i2prouter-nowrapper.1:14
@@ -426,6 +429,8 @@ msgid ""
 "will not restart if it crashes.  Also, it will use the default memory size, "
 "which may not be enough for I2P."
 msgstr ""
+"Service wrapper 없이 I2P 라우터를 시작. 오류가 난다면 시작되지 않습니다. I2P 구동에 충분하지 않은 기본 메모리 "
+"사이즈를 사용합니다."
 
 #. type: Plain text
 #: man/i2prouter-nowrapper.1:23
@@ -434,8 +439,10 @@ msgid ""
 "options.  To stop the router, use your browser to access E<.UR "
 "http://localhost:7657/> the router console E<.UE .>"
 msgstr ""
+"B<i2prouter>(1)를 사용해야 합니다. 다른 선택지는 없습니다. 라우터를 멈추려면, 브라우저를 통해 E<.UR "
+"http://localhost:7657/> 라우터 콘솔 E<.UE .> 에 접근하세요."
 
 #. type: Plain text
 #: man/i2prouter-nowrapper.1:31
 msgid "B<i2prouter>(1)"
-msgstr ""
+msgstr "B<i2prouter>(1)"
diff --git a/installer/resources/locale-man/man_pl.po b/installer/resources/locale-man/man_pl.po
new file mode 100644
index 000000000..9dc6337e5
--- /dev/null
+++ b/installer/resources/locale-man/man_pl.po
@@ -0,0 +1,469 @@
+# I2P
+# Copyright (C) 2017 The I2P Project
+# This file is distributed under the same license as the routerconsole package.
+# To contribute translations, see https://www.transifex.com/otf/I2P/dashboard/
+# zzz <zzz@mail.i2p>, 2017.
+# 
+# Translators:
+# Verdulo :-) <cybertomek@openmailbox.org>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P man pages\n"
+"POT-Creation-Date: 2017-01-26 15:24+0000\n"
+"PO-Revision-Date: 2017-01-26 15:24+0000\n"
+"Last-Translator: Verdulo :-) <cybertomek@openmailbox.org>, 2017\n"
+"Language-Team: Polish (https://www.transifex.com/otf/teams/12694/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+
+#. type: TH
+#: man/eepget.1:1
+#, no-wrap
+msgid "EEPGET"
+msgstr "EEPGET"
+
+#. type: TH
+#: man/eepget.1:1 man/i2prouter.1:1 man/i2prouter-nowrapper.1:1
+#, no-wrap
+msgid "January 26, 2017"
+msgstr "26 stycznia 2017"
+
+#. type: TH
+#: man/eepget.1:1 man/i2prouter.1:1 man/i2prouter-nowrapper.1:1
+#, no-wrap
+msgid "I2P"
+msgstr "I2P"
+
+#. type: SH
+#: man/eepget.1:3 man/i2prouter.1:3 man/i2prouter-nowrapper.1:3
+#, no-wrap
+msgid "NAME"
+msgstr "NAZWA"
+
+#. type: Plain text
+#: man/eepget.1:5
+msgid "Eepget - I2P downloader"
+msgstr "Eepget - asystent pobierania I2P"
+
+#. type: SH
+#: man/eepget.1:6 man/i2prouter.1:6 man/i2prouter-nowrapper.1:6
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr "STRESZCZENIE"
+
+#. type: Plain text
+#: man/eepget.1:9
+msgid "B<eepget> [I<options>]I<URL>"
+msgstr "B<eepget> [I<opcje>]I<URL>"
+
+#. type: SH
+#: man/eepget.1:11 man/i2prouter.1:11 man/i2prouter-nowrapper.1:10
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "OPIS"
+
+#. type: Plain text
+#: man/eepget.1:15
+msgid ""
+"Download a file non-interactively via HTTP. Transfers through both I2P and "
+"the regular Internet are supported."
+msgstr ""
+"Pobiera plik niezależnie przez HTTP. Zarówno transfery przez I2P i przez "
+"zwykły Internet są wspierane."
+
+#. type: Plain text
+#: man/eepget.1:21
+msgid ""
+"Eepget is able to cope with slow or unstable network connections; if a "
+"download is not successful because of a network problem, it will keep "
+"retrying until the whole file has been retrieved (if the -n option is set)."
+"  If supported by the remote server, eepget will instruct the server to "
+"continue the download from the point of interruption."
+msgstr ""
+"Eepget pozwala poradzić sobie z powolnym lub niestabilnym połączeniem; "
+"jeżeli pobieranie nie powiedzie się z powodu problemu z połączeniem, "
+"zostanie ono wznowione (jeżeli opcja -n jest aktywna). Jeżeli jest to "
+"wspierane przez serwer, eepget spróbuje pobrać plik od miejsca w którym "
+"pobieranie zostało przerwane."
+
+#. type: SH
+#: man/eepget.1:22
+#, no-wrap
+msgid "OPTIONS"
+msgstr "OPCJE"
+
+#. type: Plain text
+#: man/eepget.1:25
+msgid "B<-c>"
+msgstr "B<-c>"
+
+#. type: TP
+#: man/eepget.1:25
+#, no-wrap
+msgid "Clearnet. Do not use a proxy. Same as B<-p> :0 ."
+msgstr "Clearnet (zwykły Internet). Nie używa proxy. To samo co B<-p> :0."
+
+#. type: Plain text
+#: man/eepget.1:31
+msgid "B<-e> etag"
+msgstr "B<-e> etag"
+
+#. type: TP
+#: man/eepget.1:31
+#, no-wrap
+msgid "Sets the etag value in the request headers."
+msgstr "Ustawia wartość etag w nagłówku żądania."
+
+#. type: Plain text
+#: man/eepget.1:37
+msgid "B<-h> name=value"
+msgstr "B<-h> nazwa=wartość"
+
+#. type: TP
+#: man/eepget.1:37
+#, no-wrap
+msgid "Adds an arbitrary request header with the given name and value."
+msgstr "Dodaje dowolny nagłówek żądania z podaną nazwą i wartością."
+
+#. type: Plain text
+#: man/eepget.1:43
+msgid "B<-l> lineLen"
+msgstr "B<-l> długość_linii"
+
+#. type: TP
+#: man/eepget.1:43
+#, no-wrap
+msgid ""
+"Controls the progress display. B<\\ lineLen > is the length of one progress "
+"line in characters. The default is 40."
+msgstr ""
+"Dostosowuje wyświetlanie postępu. B<\\ lineLen > jest długością (w znakach) "
+"jednej linii paska postępu. Domyślnie 40."
+
+#. type: Plain text
+#: man/eepget.1:49
+msgid "B<-m> markSize"
+msgstr "B<-m> rozmiar_znaku"
+
+#. type: TP
+#: man/eepget.1:49
+#, no-wrap
+msgid ""
+"Controls the progress display. B<\\ markSize > is the number of bytes one "
+"'#' character represents. The default is 1024."
+msgstr ""
+"Dostosowuje wyświetlanie postępu. B<\\ markSize > jest liczbą bajtów "
+"reprezentowanych przez jeden znak '#'. Domyślnie 1024."
+
+#. type: Plain text
+#: man/eepget.1:55
+msgid "B<-n> retries"
+msgstr "B<-n> prób"
+
+#. type: TP
+#: man/eepget.1:55
+#, no-wrap
+msgid ""
+"Specify the number of times to retry downloading if the download isn't "
+"successful. If this option is not specified, eepget will not retry."
+msgstr ""
+"Określa ile razy spróbować ponownie pobierania w przypadku niepowodzenia. "
+"Jeżeli ta opcja nie zostanie podana, eepget nie spróbuje ponownie."
+
+#. type: Plain text
+#: man/eepget.1:61
+msgid "B<-o> file"
+msgstr "B<-o> plik_wyjściowy"
+
+#. type: TP
+#: man/eepget.1:61
+#, no-wrap
+msgid ""
+"Sets the output file to write to. If this option is not given, the output "
+"filename will be determined by the URL."
+msgstr ""
+"Określa plik wyjściowy do zapisu. Jeżeli ta opcja nie zostanie sprecyzowana,"
+" wyjściowa nazwa pliku będzie taka sama jak pierwotna z URL."
+
+#. type: Plain text
+#: man/eepget.1:67
+msgid "B<-p> proxy_host[:port]"
+msgstr "B<-p> proxy_host[:port]"
+
+#. type: TP
+#: man/eepget.1:67
+#, no-wrap
+msgid ""
+"Specify an I2P proxy server (eeproxy) to use. If the port is not specified, "
+"eepget will use 4444. If this option is not specified, eepget will use "
+"127.0.0.1:4444. Specify B<-c> or B<-p> :0 to disable the eeproxy."
+msgstr ""
+"Określa używane proxy I2P (eeproxy). Jeżeli port nie zostanie podany, eepget"
+" użyje 4444. Jeżeli ta opcja nie zostanie określona, eepget użyje "
+"127.0.0.1:4444. Określ B<-c> lub B<-p>:0, aby wyłączyć eeproxy."
+
+#. type: Plain text
+#: man/eepget.1:73
+msgid "B<-t> seconds"
+msgstr "B<-t> sekundy"
+
+#. type: TP
+#: man/eepget.1:73
+#, no-wrap
+msgid "Sets the inactivity timeout. The default is 60 seconds."
+msgstr "Określa limit czasu nieaktywności. Domyślnie 60 sekund."
+
+#. type: Plain text
+#: man/eepget.1:79
+msgid "B<-u> username"
+msgstr "B<-u> użytkownik"
+
+#. type: TP
+#: man/eepget.1:79
+#, no-wrap
+msgid "Sets the username for proxy authorization, if required."
+msgstr "Ustawia nazwę użytkownika dla autoryzacji proxy (jeżeli konieczna)."
+
+#. type: Plain text
+#: man/eepget.1:85
+msgid "B<-x> password"
+msgstr "B<-x> hasło"
+
+#. type: TP
+#: man/eepget.1:85
+#, no-wrap
+msgid ""
+"Sets the password for proxy authorization, if required. If a username is "
+"specified but not a password, EepGet will prompt for the password."
+msgstr ""
+"Ustawia hasło dla autoryzacji proxy (jeżeli konieczna). Jeżeli nazwa "
+"użytkownika jest określona, ale nie hasło, eepget zapyta o hasło."
+
+#. type: SH
+#: man/eepget.1:89
+#, no-wrap
+msgid "EXIT STATUS"
+msgstr "KOD WYJŚCIOWY"
+
+#. type: Plain text
+#: man/eepget.1:93
+msgid ""
+"B<eepget> exits with status zero upon successful transfer and non-zero if "
+"there were problems with the download."
+msgstr ""
+"B<eepget> kończy pracę z kodem zero po pomyślnym pobraniu i z kodem nie-"
+"zerowym jeżeli wystąpiły problemy z pobieraniem."
+
+#. type: SH
+#: man/eepget.1:94 man/i2prouter.1:54 man/i2prouter-nowrapper.1:24
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr "ZGŁASZANIE BŁĘDÓW"
+
+#. type: Plain text
+#: man/eepget.1:99 man/i2prouter.1:59 man/i2prouter-nowrapper.1:29
+msgid ""
+"Please enter a ticket on E<.UR https://trac.i2p2.de/> the I2P trac page "
+"E<.UE .>"
+msgstr ""
+"Prosimy zgłosić błąd na E<.UR https://trac.i2p2.de/> stronie I2P trac E<.UE "
+".>"
+
+#. type: SH
+#: man/eepget.1:100 man/i2prouter.1:60 man/i2prouter-nowrapper.1:30
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "ZOBACZ TAKŻE"
+
+#. type: Plain text
+#: man/eepget.1:104
+msgid "B<i2prouter>(1)  B<curl>(1)  B<wget>(1)"
+msgstr "B<i2prouter>(1) B<curl>(1) B<wget>(1)"
+
+#. type: TH
+#: man/i2prouter.1:1
+#, no-wrap
+msgid "I2PROUTER"
+msgstr "I2PROUTER"
+
+#. type: Plain text
+#: man/i2prouter.1:5
+msgid "i2prouter - start and stop the I2P router"
+msgstr "I2prouter - uruchom i zatrzymaj węzeł I2P"
+
+#. type: Plain text
+#: man/i2prouter.1:9
+msgid ""
+"B<i2prouter> "
+"{I<console>|I<start>|I<stop>|I<graceful>|I<restart>|I<condrestart>|I<status>|I<dump>|I<install>|I<remove>}"
+msgstr ""
+"B<i2prouter> "
+"{I<console>|I<start>|I<stop>|I<graceful>|I<restart>|I<condrestart>|I<status>|I<dump>|I<install>|I<remove>}"
+
+#. type: Plain text
+#: man/i2prouter.1:13
+msgid "Control the I2P service."
+msgstr "Zarządza usługą I2P."
+
+#. type: IP
+#: man/i2prouter.1:15
+#, no-wrap
+msgid "B<console>"
+msgstr "B<console>"
+
+#. type: Plain text
+#: man/i2prouter.1:17
+msgid "Runs I2P as a console application under the current user."
+msgstr "Uruchamia I2P jako aplikację konsoli jako obecny użytkownik."
+
+#. type: IP
+#: man/i2prouter.1:19
+#, no-wrap
+msgid "B<start>"
+msgstr "B<start>"
+
+#. type: Plain text
+#: man/i2prouter.1:21
+msgid "Starts the I2P service."
+msgstr "Uruchamia usługę I2P."
+
+#. type: IP
+#: man/i2prouter.1:23
+#, no-wrap
+msgid "B<stop>"
+msgstr "B<stop>"
+
+#. type: Plain text
+#: man/i2prouter.1:25
+msgid "Stops the I2P service."
+msgstr "Zatrzymuje usługę I2P."
+
+#. type: IP
+#: man/i2prouter.1:27
+#, no-wrap
+msgid "B<restart>"
+msgstr "B<restart>"
+
+#. type: Plain text
+#: man/i2prouter.1:29
+msgid "Stops the I2P service and then starts it."
+msgstr "Zatrzymuje i uruchamia ponownie usługę I2P."
+
+#. type: IP
+#: man/i2prouter.1:31
+#, no-wrap
+msgid "B<condrestart>"
+msgstr "B<condrestart>"
+
+#. type: Plain text
+#: man/i2prouter.1:33
+msgid "Restart the I2P service only if it is already running."
+msgstr "Restartuje usługę I2P tylko jeżeli jest już uruchomiona."
+
+#. type: IP
+#: man/i2prouter.1:35
+#, no-wrap
+msgid "B<graceful>"
+msgstr "B<graceful>"
+
+#. type: Plain text
+#: man/i2prouter.1:37
+msgid "Stop I2P gracefully (may take up to 11 minutes)"
+msgstr "Elegancko zatrzymuje I2P (może potrwać do 11 minut)."
+
+#. type: IP
+#: man/i2prouter.1:39
+#, no-wrap
+msgid "B<install>"
+msgstr "B<install>"
+
+#. type: Plain text
+#: man/i2prouter.1:41
+msgid "Install initscript to start I2P automatically when the system boots."
+msgstr ""
+"Instaluje initscript, aby uruchamiać I2P automatycznie podczas startu "
+"systemu."
+
+#. type: IP
+#: man/i2prouter.1:43
+#, no-wrap
+msgid "B<remove>"
+msgstr "B<remove>"
+
+#. type: Plain text
+#: man/i2prouter.1:45
+msgid "Uninstall initscript that was installed with B<install>"
+msgstr "Usuwa initscript zainstalowany poprzez polecenie B<install>."
+
+#. type: IP
+#: man/i2prouter.1:47
+#, no-wrap
+msgid "B<status>"
+msgstr "B<status>"
+
+#. type: Plain text
+#: man/i2prouter.1:49
+msgid "Prints whether the I2P service is running."
+msgstr "Wyświetla czy usługa I2P jest uruchomiona."
+
+#. type: IP
+#: man/i2prouter.1:51
+#, no-wrap
+msgid "B<dump>"
+msgstr "B<dump>"
+
+#. type: Plain text
+#: man/i2prouter.1:53
+msgid "Dumps the current threads into B<wrapper.log>."
+msgstr "Zrzuca działające wątki do B<wrapper.log>."
+
+#. type: Plain text
+#: man/i2prouter.1:61
+msgid "B<i2prouter-nowrapper>(1)"
+msgstr "B<i2prouter-nowrapper>(1)"
+
+#. type: TH
+#: man/i2prouter-nowrapper.1:1
+#, no-wrap
+msgid "I2PROUTER-NOWRAPPER"
+msgstr "I2PROUTER-NOWRAPPER"
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:5
+msgid "i2prouter-nowrapper - start the I2P router"
+msgstr "i2prouter-nowrapper - uruchom węzeł I2P"
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:8
+msgid "B<i2prouter-nowrapper>"
+msgstr "B<i2prouter-nowrapper>"
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:14
+msgid ""
+"Start the I2P router, without the service wrapper.  This means the router "
+"will not restart if it crashes.  Also, it will use the default memory size, "
+"which may not be enough for I2P."
+msgstr ""
+"Uruchamia węzeł I2P bez usługi wrappera. To oznacza, że węzeł I2P nie "
+"zrestartuje się w razie awarii. Zostanie także użyta domyślna ilość pamięci,"
+" która może być niewystarczająca dla I2P."
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:23
+msgid ""
+"You should really use the B<i2prouter>(1)  script instead.  There are no "
+"options.  To stop the router, use your browser to access E<.UR "
+"http://localhost:7657/> the router console E<.UE .>"
+msgstr ""
+"Naprawdę powinieneś zamiast tego użyć skryptu B<i2prouter>(1). Tutaj nie ma "
+"opcji. Aby zatrzymać węzeł, użyj przeglądarki i wywołaj E<.UR "
+"http://localhost:7657/> konsolę węzła E<.UE .>"
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:31
+msgid "B<i2prouter>(1)"
+msgstr "B<i2prouter>(1)"
diff --git a/installer/resources/locale-man/man_pt_BR.po b/installer/resources/locale-man/man_pt_BR.po
new file mode 100644
index 000000000..2fce2db03
--- /dev/null
+++ b/installer/resources/locale-man/man_pt_BR.po
@@ -0,0 +1,435 @@
+# I2P
+# Copyright (C) 2017 The I2P Project
+# This file is distributed under the same license as the routerconsole package.
+# To contribute translations, see https://www.transifex.com/otf/I2P/dashboard/
+# zzz <zzz@mail.i2p>, 2017.
+# 
+# Translators:
+# blueboy <leonardohcoelho@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P man pages\n"
+"POT-Creation-Date: 2017-01-26 15:24+0000\n"
+"PO-Revision-Date: 2017-01-26 15:24+0000\n"
+"Last-Translator: blueboy <leonardohcoelho@gmail.com>, 2017\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/12694/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: TH
+#: man/eepget.1:1
+#, no-wrap
+msgid "EEPGET"
+msgstr ""
+
+#. type: TH
+#: man/eepget.1:1 man/i2prouter.1:1 man/i2prouter-nowrapper.1:1
+#, no-wrap
+msgid "January 26, 2017"
+msgstr "26 de Janeiro de 2017"
+
+#. type: TH
+#: man/eepget.1:1 man/i2prouter.1:1 man/i2prouter-nowrapper.1:1
+#, no-wrap
+msgid "I2P"
+msgstr "I2P"
+
+#. type: SH
+#: man/eepget.1:3 man/i2prouter.1:3 man/i2prouter-nowrapper.1:3
+#, no-wrap
+msgid "NAME"
+msgstr "NOME"
+
+#. type: Plain text
+#: man/eepget.1:5
+msgid "Eepget - I2P downloader"
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:6 man/i2prouter.1:6 man/i2prouter-nowrapper.1:6
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr "SINOPSE"
+
+#. type: Plain text
+#: man/eepget.1:9
+msgid "B<eepget> [I<options>]I<URL>"
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:11 man/i2prouter.1:11 man/i2prouter-nowrapper.1:10
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "DESCRIÇÃO"
+
+#. type: Plain text
+#: man/eepget.1:15
+msgid ""
+"Download a file non-interactively via HTTP. Transfers through both I2P and "
+"the regular Internet are supported."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:21
+msgid ""
+"Eepget is able to cope with slow or unstable network connections; if a "
+"download is not successful because of a network problem, it will keep "
+"retrying until the whole file has been retrieved (if the -n option is set)."
+"  If supported by the remote server, eepget will instruct the server to "
+"continue the download from the point of interruption."
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:22
+#, no-wrap
+msgid "OPTIONS"
+msgstr "OPÇÕES"
+
+#. type: Plain text
+#: man/eepget.1:25
+msgid "B<-c>"
+msgstr "B<-c>"
+
+#. type: TP
+#: man/eepget.1:25
+#, no-wrap
+msgid "Clearnet. Do not use a proxy. Same as B<-p> :0 ."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:31
+msgid "B<-e> etag"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:31
+#, no-wrap
+msgid "Sets the etag value in the request headers."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:37
+msgid "B<-h> name=value"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:37
+#, no-wrap
+msgid "Adds an arbitrary request header with the given name and value."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:43
+msgid "B<-l> lineLen"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:43
+#, no-wrap
+msgid ""
+"Controls the progress display. B<\\ lineLen > is the length of one progress "
+"line in characters. The default is 40."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:49
+msgid "B<-m> markSize"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:49
+#, no-wrap
+msgid ""
+"Controls the progress display. B<\\ markSize > is the number of bytes one "
+"'#' character represents. The default is 1024."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:55
+msgid "B<-n> retries"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:55
+#, no-wrap
+msgid ""
+"Specify the number of times to retry downloading if the download isn't "
+"successful. If this option is not specified, eepget will not retry."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:61
+msgid "B<-o> file"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:61
+#, no-wrap
+msgid ""
+"Sets the output file to write to. If this option is not given, the output "
+"filename will be determined by the URL."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:67
+msgid "B<-p> proxy_host[:port]"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:67
+#, no-wrap
+msgid ""
+"Specify an I2P proxy server (eeproxy) to use. If the port is not specified, "
+"eepget will use 4444. If this option is not specified, eepget will use "
+"127.0.0.1:4444. Specify B<-c> or B<-p> :0 to disable the eeproxy."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:73
+msgid "B<-t> seconds"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:73
+#, no-wrap
+msgid "Sets the inactivity timeout. The default is 60 seconds."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:79
+msgid "B<-u> username"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:79
+#, no-wrap
+msgid "Sets the username for proxy authorization, if required."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:85
+msgid "B<-x> password"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:85
+#, no-wrap
+msgid ""
+"Sets the password for proxy authorization, if required. If a username is "
+"specified but not a password, EepGet will prompt for the password."
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:89
+#, no-wrap
+msgid "EXIT STATUS"
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:93
+msgid ""
+"B<eepget> exits with status zero upon successful transfer and non-zero if "
+"there were problems with the download."
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:94 man/i2prouter.1:54 man/i2prouter-nowrapper.1:24
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:99 man/i2prouter.1:59 man/i2prouter-nowrapper.1:29
+msgid ""
+"Please enter a ticket on E<.UR https://trac.i2p2.de/> the I2P trac page "
+"E<.UE .>"
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:100 man/i2prouter.1:60 man/i2prouter-nowrapper.1:30
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "VER TAMBÉM"
+
+#. type: Plain text
+#: man/eepget.1:104
+msgid "B<i2prouter>(1)  B<curl>(1)  B<wget>(1)"
+msgstr ""
+
+#. type: TH
+#: man/i2prouter.1:1
+#, no-wrap
+msgid "I2PROUTER"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:5
+msgid "i2prouter - start and stop the I2P router"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:9
+msgid ""
+"B<i2prouter> "
+"{I<console>|I<start>|I<stop>|I<graceful>|I<restart>|I<condrestart>|I<status>|I<dump>|I<install>|I<remove>}"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:13
+msgid "Control the I2P service."
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:15
+#, no-wrap
+msgid "B<console>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:17
+msgid "Runs I2P as a console application under the current user."
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:19
+#, no-wrap
+msgid "B<start>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:21
+msgid "Starts the I2P service."
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:23
+#, no-wrap
+msgid "B<stop>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:25
+msgid "Stops the I2P service."
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:27
+#, no-wrap
+msgid "B<restart>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:29
+msgid "Stops the I2P service and then starts it."
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:31
+#, no-wrap
+msgid "B<condrestart>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:33
+msgid "Restart the I2P service only if it is already running."
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:35
+#, no-wrap
+msgid "B<graceful>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:37
+msgid "Stop I2P gracefully (may take up to 11 minutes)"
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:39
+#, no-wrap
+msgid "B<install>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:41
+msgid "Install initscript to start I2P automatically when the system boots."
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:43
+#, no-wrap
+msgid "B<remove>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:45
+msgid "Uninstall initscript that was installed with B<install>"
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:47
+#, no-wrap
+msgid "B<status>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:49
+msgid "Prints whether the I2P service is running."
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:51
+#, no-wrap
+msgid "B<dump>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:53
+msgid "Dumps the current threads into B<wrapper.log>."
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:61
+msgid "B<i2prouter-nowrapper>(1)"
+msgstr ""
+
+#. type: TH
+#: man/i2prouter-nowrapper.1:1
+#, no-wrap
+msgid "I2PROUTER-NOWRAPPER"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:5
+msgid "i2prouter-nowrapper - start the I2P router"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:8
+msgid "B<i2prouter-nowrapper>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:14
+msgid ""
+"Start the I2P router, without the service wrapper.  This means the router "
+"will not restart if it crashes.  Also, it will use the default memory size, "
+"which may not be enough for I2P."
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:23
+msgid ""
+"You should really use the B<i2prouter>(1)  script instead.  There are no "
+"options.  To stop the router, use your browser to access E<.UR "
+"http://localhost:7657/> the router console E<.UE .>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:31
+msgid "B<i2prouter>(1)"
+msgstr ""
diff --git a/installer/resources/locale-man/man_ru.po b/installer/resources/locale-man/man_ru.po
new file mode 100644
index 000000000..70cb0d09d
--- /dev/null
+++ b/installer/resources/locale-man/man_ru.po
@@ -0,0 +1,435 @@
+# I2P
+# Copyright (C) 2017 The I2P Project
+# This file is distributed under the same license as the routerconsole package.
+# To contribute translations, see https://www.transifex.com/otf/I2P/dashboard/
+# zzz <zzz@mail.i2p>, 2017.
+# 
+# Translators:
+# yume <yumenokazu@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P man pages\n"
+"POT-Creation-Date: 2017-01-26 15:24+0000\n"
+"PO-Revision-Date: 2017-01-26 15:24+0000\n"
+"Last-Translator: yume <yumenokazu@gmail.com>, 2017\n"
+"Language-Team: Russian (Russia) (https://www.transifex.com/otf/teams/12694/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_RU\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#. type: TH
+#: man/eepget.1:1
+#, no-wrap
+msgid "EEPGET"
+msgstr "EEPGET"
+
+#. type: TH
+#: man/eepget.1:1 man/i2prouter.1:1 man/i2prouter-nowrapper.1:1
+#, no-wrap
+msgid "January 26, 2017"
+msgstr "26 января 2017"
+
+#. type: TH
+#: man/eepget.1:1 man/i2prouter.1:1 man/i2prouter-nowrapper.1:1
+#, no-wrap
+msgid "I2P"
+msgstr "I2P"
+
+#. type: SH
+#: man/eepget.1:3 man/i2prouter.1:3 man/i2prouter-nowrapper.1:3
+#, no-wrap
+msgid "NAME"
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:5
+msgid "Eepget - I2P downloader"
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:6 man/i2prouter.1:6 man/i2prouter-nowrapper.1:6
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:9
+msgid "B<eepget> [I<options>]I<URL>"
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:11 man/i2prouter.1:11 man/i2prouter-nowrapper.1:10
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "ОПИСАНИЕ"
+
+#. type: Plain text
+#: man/eepget.1:15
+msgid ""
+"Download a file non-interactively via HTTP. Transfers through both I2P and "
+"the regular Internet are supported."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:21
+msgid ""
+"Eepget is able to cope with slow or unstable network connections; if a "
+"download is not successful because of a network problem, it will keep "
+"retrying until the whole file has been retrieved (if the -n option is set)."
+"  If supported by the remote server, eepget will instruct the server to "
+"continue the download from the point of interruption."
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:22
+#, no-wrap
+msgid "OPTIONS"
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:25
+msgid "B<-c>"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:25
+#, no-wrap
+msgid "Clearnet. Do not use a proxy. Same as B<-p> :0 ."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:31
+msgid "B<-e> etag"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:31
+#, no-wrap
+msgid "Sets the etag value in the request headers."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:37
+msgid "B<-h> name=value"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:37
+#, no-wrap
+msgid "Adds an arbitrary request header with the given name and value."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:43
+msgid "B<-l> lineLen"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:43
+#, no-wrap
+msgid ""
+"Controls the progress display. B<\\ lineLen > is the length of one progress "
+"line in characters. The default is 40."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:49
+msgid "B<-m> markSize"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:49
+#, no-wrap
+msgid ""
+"Controls the progress display. B<\\ markSize > is the number of bytes one "
+"'#' character represents. The default is 1024."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:55
+msgid "B<-n> retries"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:55
+#, no-wrap
+msgid ""
+"Specify the number of times to retry downloading if the download isn't "
+"successful. If this option is not specified, eepget will not retry."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:61
+msgid "B<-o> file"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:61
+#, no-wrap
+msgid ""
+"Sets the output file to write to. If this option is not given, the output "
+"filename will be determined by the URL."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:67
+msgid "B<-p> proxy_host[:port]"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:67
+#, no-wrap
+msgid ""
+"Specify an I2P proxy server (eeproxy) to use. If the port is not specified, "
+"eepget will use 4444. If this option is not specified, eepget will use "
+"127.0.0.1:4444. Specify B<-c> or B<-p> :0 to disable the eeproxy."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:73
+msgid "B<-t> seconds"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:73
+#, no-wrap
+msgid "Sets the inactivity timeout. The default is 60 seconds."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:79
+msgid "B<-u> username"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:79
+#, no-wrap
+msgid "Sets the username for proxy authorization, if required."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:85
+msgid "B<-x> password"
+msgstr ""
+
+#. type: TP
+#: man/eepget.1:85
+#, no-wrap
+msgid ""
+"Sets the password for proxy authorization, if required. If a username is "
+"specified but not a password, EepGet will prompt for the password."
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:89
+#, no-wrap
+msgid "EXIT STATUS"
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:93
+msgid ""
+"B<eepget> exits with status zero upon successful transfer and non-zero if "
+"there were problems with the download."
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:94 man/i2prouter.1:54 man/i2prouter-nowrapper.1:24
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:99 man/i2prouter.1:59 man/i2prouter-nowrapper.1:29
+msgid ""
+"Please enter a ticket on E<.UR https://trac.i2p2.de/> the I2P trac page "
+"E<.UE .>"
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:100 man/i2prouter.1:60 man/i2prouter-nowrapper.1:30
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "СМ. ТАКЖЕ"
+
+#. type: Plain text
+#: man/eepget.1:104
+msgid "B<i2prouter>(1)  B<curl>(1)  B<wget>(1)"
+msgstr ""
+
+#. type: TH
+#: man/i2prouter.1:1
+#, no-wrap
+msgid "I2PROUTER"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:5
+msgid "i2prouter - start and stop the I2P router"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:9
+msgid ""
+"B<i2prouter> "
+"{I<console>|I<start>|I<stop>|I<graceful>|I<restart>|I<condrestart>|I<status>|I<dump>|I<install>|I<remove>}"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:13
+msgid "Control the I2P service."
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:15
+#, no-wrap
+msgid "B<console>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:17
+msgid "Runs I2P as a console application under the current user."
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:19
+#, no-wrap
+msgid "B<start>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:21
+msgid "Starts the I2P service."
+msgstr "Запускает сервис I2P"
+
+#. type: IP
+#: man/i2prouter.1:23
+#, no-wrap
+msgid "B<stop>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:25
+msgid "Stops the I2P service."
+msgstr "Останавливает сервис I2P"
+
+#. type: IP
+#: man/i2prouter.1:27
+#, no-wrap
+msgid "B<restart>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:29
+msgid "Stops the I2P service and then starts it."
+msgstr "Останавливает сервис I2P и затем запускет его."
+
+#. type: IP
+#: man/i2prouter.1:31
+#, no-wrap
+msgid "B<condrestart>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:33
+msgid "Restart the I2P service only if it is already running."
+msgstr "Перезапускает сервис I2P, только если он уже запущен."
+
+#. type: IP
+#: man/i2prouter.1:35
+#, no-wrap
+msgid "B<graceful>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:37
+msgid "Stop I2P gracefully (may take up to 11 minutes)"
+msgstr "Постепенно остановить сервис I2P (может занять до 11 минут)"
+
+#. type: IP
+#: man/i2prouter.1:39
+#, no-wrap
+msgid "B<install>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:41
+msgid "Install initscript to start I2P automatically when the system boots."
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:43
+#, no-wrap
+msgid "B<remove>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:45
+msgid "Uninstall initscript that was installed with B<install>"
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:47
+#, no-wrap
+msgid "B<status>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:49
+msgid "Prints whether the I2P service is running."
+msgstr "Сообщает, запущен ли I2P сервис."
+
+#. type: IP
+#: man/i2prouter.1:51
+#, no-wrap
+msgid "B<dump>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:53
+msgid "Dumps the current threads into B<wrapper.log>."
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:61
+msgid "B<i2prouter-nowrapper>(1)"
+msgstr ""
+
+#. type: TH
+#: man/i2prouter-nowrapper.1:1
+#, no-wrap
+msgid "I2PROUTER-NOWRAPPER"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:5
+msgid "i2prouter-nowrapper - start the I2P router"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:8
+msgid "B<i2prouter-nowrapper>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:14
+msgid ""
+"Start the I2P router, without the service wrapper.  This means the router "
+"will not restart if it crashes.  Also, it will use the default memory size, "
+"which may not be enough for I2P."
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:23
+msgid ""
+"You should really use the B<i2prouter>(1)  script instead.  There are no "
+"options.  To stop the router, use your browser to access E<.UR "
+"http://localhost:7657/> the router console E<.UE .>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:31
+msgid "B<i2prouter>(1)"
+msgstr ""
diff --git a/installer/resources/locale-man/man_sv.po b/installer/resources/locale-man/man_sv.po
new file mode 100644
index 000000000..d4b3f7529
--- /dev/null
+++ b/installer/resources/locale-man/man_sv.po
@@ -0,0 +1,435 @@
+# I2P
+# Copyright (C) 2017 The I2P Project
+# This file is distributed under the same license as the routerconsole package.
+# To contribute translations, see https://www.transifex.com/otf/I2P/dashboard/
+# zzz <zzz@mail.i2p>, 2017.
+# 
+# Translators:
+# Henrik Mattsson-Mårn <h@reglage.net>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P man pages\n"
+"POT-Creation-Date: 2017-01-26 15:24+0000\n"
+"PO-Revision-Date: 2017-01-26 15:24+0000\n"
+"Last-Translator: Henrik Mattsson-Mårn <h@reglage.net>, 2017\n"
+"Language-Team: Swedish (Sweden) (https://www.transifex.com/otf/teams/12694/sv_SE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv_SE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: TH
+#: man/eepget.1:1
+#, no-wrap
+msgid "EEPGET"
+msgstr "EEPGET"
+
+#. type: TH
+#: man/eepget.1:1 man/i2prouter.1:1 man/i2prouter-nowrapper.1:1
+#, no-wrap
+msgid "January 26, 2017"
+msgstr ""
+
+#. type: TH
+#: man/eepget.1:1 man/i2prouter.1:1 man/i2prouter-nowrapper.1:1
+#, no-wrap
+msgid "I2P"
+msgstr "I2P"
+
+#. type: SH
+#: man/eepget.1:3 man/i2prouter.1:3 man/i2prouter-nowrapper.1:3
+#, no-wrap
+msgid "NAME"
+msgstr "NAME"
+
+#. type: Plain text
+#: man/eepget.1:5
+msgid "Eepget - I2P downloader"
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:6 man/i2prouter.1:6 man/i2prouter-nowrapper.1:6
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr "SYNOPSIS"
+
+#. type: Plain text
+#: man/eepget.1:9
+msgid "B<eepget> [I<options>]I<URL>"
+msgstr "B<eepget> [I<options>]I<URL>"
+
+#. type: SH
+#: man/eepget.1:11 man/i2prouter.1:11 man/i2prouter-nowrapper.1:10
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "DESCRIPTION"
+
+#. type: Plain text
+#: man/eepget.1:15
+msgid ""
+"Download a file non-interactively via HTTP. Transfers through both I2P and "
+"the regular Internet are supported."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:21
+msgid ""
+"Eepget is able to cope with slow or unstable network connections; if a "
+"download is not successful because of a network problem, it will keep "
+"retrying until the whole file has been retrieved (if the -n option is set)."
+"  If supported by the remote server, eepget will instruct the server to "
+"continue the download from the point of interruption."
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:22
+#, no-wrap
+msgid "OPTIONS"
+msgstr "OPTIONS"
+
+#. type: Plain text
+#: man/eepget.1:25
+msgid "B<-c>"
+msgstr "B<-c>"
+
+#. type: TP
+#: man/eepget.1:25
+#, no-wrap
+msgid "Clearnet. Do not use a proxy. Same as B<-p> :0 ."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:31
+msgid "B<-e> etag"
+msgstr "B<-e> etag"
+
+#. type: TP
+#: man/eepget.1:31
+#, no-wrap
+msgid "Sets the etag value in the request headers."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:37
+msgid "B<-h> name=value"
+msgstr "B<-h> name=value"
+
+#. type: TP
+#: man/eepget.1:37
+#, no-wrap
+msgid "Adds an arbitrary request header with the given name and value."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:43
+msgid "B<-l> lineLen"
+msgstr "B<-l> lineLen"
+
+#. type: TP
+#: man/eepget.1:43
+#, no-wrap
+msgid ""
+"Controls the progress display. B<\\ lineLen > is the length of one progress "
+"line in characters. The default is 40."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:49
+msgid "B<-m> markSize"
+msgstr "B<-m> markSize"
+
+#. type: TP
+#: man/eepget.1:49
+#, no-wrap
+msgid ""
+"Controls the progress display. B<\\ markSize > is the number of bytes one "
+"'#' character represents. The default is 1024."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:55
+msgid "B<-n> retries"
+msgstr "B<-n> retries"
+
+#. type: TP
+#: man/eepget.1:55
+#, no-wrap
+msgid ""
+"Specify the number of times to retry downloading if the download isn't "
+"successful. If this option is not specified, eepget will not retry."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:61
+msgid "B<-o> file"
+msgstr "B<-o> file"
+
+#. type: TP
+#: man/eepget.1:61
+#, no-wrap
+msgid ""
+"Sets the output file to write to. If this option is not given, the output "
+"filename will be determined by the URL."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:67
+msgid "B<-p> proxy_host[:port]"
+msgstr "B<-p> proxy_host[:port]"
+
+#. type: TP
+#: man/eepget.1:67
+#, no-wrap
+msgid ""
+"Specify an I2P proxy server (eeproxy) to use. If the port is not specified, "
+"eepget will use 4444. If this option is not specified, eepget will use "
+"127.0.0.1:4444. Specify B<-c> or B<-p> :0 to disable the eeproxy."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:73
+msgid "B<-t> seconds"
+msgstr "B<-t> seconds"
+
+#. type: TP
+#: man/eepget.1:73
+#, no-wrap
+msgid "Sets the inactivity timeout. The default is 60 seconds."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:79
+msgid "B<-u> username"
+msgstr "B<-u> username"
+
+#. type: TP
+#: man/eepget.1:79
+#, no-wrap
+msgid "Sets the username for proxy authorization, if required."
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:85
+msgid "B<-x> password"
+msgstr "B<-x> password"
+
+#. type: TP
+#: man/eepget.1:85
+#, no-wrap
+msgid ""
+"Sets the password for proxy authorization, if required. If a username is "
+"specified but not a password, EepGet will prompt for the password."
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:89
+#, no-wrap
+msgid "EXIT STATUS"
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:93
+msgid ""
+"B<eepget> exits with status zero upon successful transfer and non-zero if "
+"there were problems with the download."
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:94 man/i2prouter.1:54 man/i2prouter-nowrapper.1:24
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:99 man/i2prouter.1:59 man/i2prouter-nowrapper.1:29
+msgid ""
+"Please enter a ticket on E<.UR https://trac.i2p2.de/> the I2P trac page "
+"E<.UE .>"
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:100 man/i2prouter.1:60 man/i2prouter-nowrapper.1:30
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "SEE ALSO"
+
+#. type: Plain text
+#: man/eepget.1:104
+msgid "B<i2prouter>(1)  B<curl>(1)  B<wget>(1)"
+msgstr ""
+
+#. type: TH
+#: man/i2prouter.1:1
+#, no-wrap
+msgid "I2PROUTER"
+msgstr "I2PROUTER"
+
+#. type: Plain text
+#: man/i2prouter.1:5
+msgid "i2prouter - start and stop the I2P router"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:9
+msgid ""
+"B<i2prouter> "
+"{I<console>|I<start>|I<stop>|I<graceful>|I<restart>|I<condrestart>|I<status>|I<dump>|I<install>|I<remove>}"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:13
+msgid "Control the I2P service."
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:15
+#, no-wrap
+msgid "B<console>"
+msgstr "B<console>"
+
+#. type: Plain text
+#: man/i2prouter.1:17
+msgid "Runs I2P as a console application under the current user."
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:19
+#, no-wrap
+msgid "B<start>"
+msgstr "B<start>"
+
+#. type: Plain text
+#: man/i2prouter.1:21
+msgid "Starts the I2P service."
+msgstr "Startar I2P-tjänsten."
+
+#. type: IP
+#: man/i2prouter.1:23
+#, no-wrap
+msgid "B<stop>"
+msgstr "B<stop>"
+
+#. type: Plain text
+#: man/i2prouter.1:25
+msgid "Stops the I2P service."
+msgstr "Stoppar I2P-tjänsten."
+
+#. type: IP
+#: man/i2prouter.1:27
+#, no-wrap
+msgid "B<restart>"
+msgstr "B<restart>"
+
+#. type: Plain text
+#: man/i2prouter.1:29
+msgid "Stops the I2P service and then starts it."
+msgstr "Stoppar I2P-tjänsten och startar den sedan."
+
+#. type: IP
+#: man/i2prouter.1:31
+#, no-wrap
+msgid "B<condrestart>"
+msgstr "B<condrestart>"
+
+#. type: Plain text
+#: man/i2prouter.1:33
+msgid "Restart the I2P service only if it is already running."
+msgstr "Startar om I2P-tjänsten endast om den redan körs."
+
+#. type: IP
+#: man/i2prouter.1:35
+#, no-wrap
+msgid "B<graceful>"
+msgstr "B<graceful>"
+
+#. type: Plain text
+#: man/i2prouter.1:37
+msgid "Stop I2P gracefully (may take up to 11 minutes)"
+msgstr "Stoppar I2P varsamt (kan ta upp till 11 minuter)"
+
+#. type: IP
+#: man/i2prouter.1:39
+#, no-wrap
+msgid "B<install>"
+msgstr "B<install>"
+
+#. type: Plain text
+#: man/i2prouter.1:41
+msgid "Install initscript to start I2P automatically when the system boots."
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:43
+#, no-wrap
+msgid "B<remove>"
+msgstr "B<remove>"
+
+#. type: Plain text
+#: man/i2prouter.1:45
+msgid "Uninstall initscript that was installed with B<install>"
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:47
+#, no-wrap
+msgid "B<status>"
+msgstr "B<status>"
+
+#. type: Plain text
+#: man/i2prouter.1:49
+msgid "Prints whether the I2P service is running."
+msgstr ""
+
+#. type: IP
+#: man/i2prouter.1:51
+#, no-wrap
+msgid "B<dump>"
+msgstr "B<dump>"
+
+#. type: Plain text
+#: man/i2prouter.1:53
+msgid "Dumps the current threads into B<wrapper.log>."
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:61
+msgid "B<i2prouter-nowrapper>(1)"
+msgstr "B<i2prouter-nowrapper>(1)"
+
+#. type: TH
+#: man/i2prouter-nowrapper.1:1
+#, no-wrap
+msgid "I2PROUTER-NOWRAPPER"
+msgstr "I2PROUTER-NOWRAPPER"
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:5
+msgid "i2prouter-nowrapper - start the I2P router"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:8
+msgid "B<i2prouter-nowrapper>"
+msgstr "B<i2prouter-nowrapper>"
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:14
+msgid ""
+"Start the I2P router, without the service wrapper.  This means the router "
+"will not restart if it crashes.  Also, it will use the default memory size, "
+"which may not be enough for I2P."
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:23
+msgid ""
+"You should really use the B<i2prouter>(1)  script instead.  There are no "
+"options.  To stop the router, use your browser to access E<.UR "
+"http://localhost:7657/> the router console E<.UE .>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:31
+msgid "B<i2prouter>(1)"
+msgstr "B<i2prouter>(1)"
diff --git a/installer/resources/locale-man/man_zh.po b/installer/resources/locale-man/man_zh.po
index 63b212697..2217c45fb 100644
--- a/installer/resources/locale-man/man_zh.po
+++ b/installer/resources/locale-man/man_zh.po
@@ -6,12 +6,13 @@
 # 
 # Translators:
 # YF <yfdyh000@gmail.com>, 2017
+# 黃彥儒 <r1235613@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P man pages\n"
 "POT-Creation-Date: 2017-01-26 15:24+0000\n"
 "PO-Revision-Date: 2017-01-26 15:24+0000\n"
-"Last-Translator: YF <yfdyh000@gmail.com>, 2017\n"
+"Last-Translator: 黃彥儒 <r1235613@gmail.com>, 2017\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/12694/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -173,7 +174,7 @@ msgstr "B<-o> 文件"
 msgid ""
 "Sets the output file to write to. If this option is not given, the output "
 "filename will be determined by the URL."
-msgstr ""
+msgstr "设置要写入的输出文件。 如果未指定此选项，输出文件名将由URL确定。"
 
 #. type: Plain text
 #: man/eepget.1:67
diff --git a/installer/resources/man/eepget.it.1 b/installer/resources/man/eepget.it.1
index 0ec4ece28..137c619e0 100644
--- a/installer/resources/man/eepget.it.1
+++ b/installer/resources/man/eepget.it.1
@@ -6,10 +6,10 @@
 .TH EEPGET 1 "26 Gennaio 2017" "" I2P
 
 .SH NOME
-Eepget \- I2P downloader
+Eepget \- Downloader I2P
 
 .SH SINOSSI
-\fBeepget\fP [\fIoptions\fP]\fIURL\fP
+\fBeepget\fP [\fIopzioni\fP]\fIURL\fP
 .br
 
 .SH DESCRIZIONE
@@ -34,7 +34,7 @@ Clearnet. Do not use a proxy. Same as \fB\-p\fP :0 .
 Sets the etag value in the request headers.
 .TP 
 
-\fB\-h\fP name=value
+\fB\-h\fP nome=valore
 .TP 
 Adds an arbitrary request header with the given name and value.
 .TP 
@@ -84,12 +84,12 @@ Sets the password for proxy authorization, if required. If a username is specifi
 \fBeepget\fP exits with status zero upon successful transfer and non\-zero if
 there were problems with the download.
 
-.SH "REPORTING BUGS"
+.SH "SEGNALAZIONE BUG"
 Please enter a ticket on
 .UR https://trac.i2p2.de/
 the I2P trac page
 .UE .
 
-.SH "SEE ALSO"
+.SH "VEDI ANCHE"
 \fBi2prouter\fP(1)  \fBcurl\fP(1)  \fBwget\fP(1)
 
diff --git a/installer/resources/man/eepget.ko.1 b/installer/resources/man/eepget.ko.1
index e8b81d63c..7cc18790b 100644
--- a/installer/resources/man/eepget.ko.1
+++ b/installer/resources/man/eepget.ko.1
@@ -78,14 +78,13 @@ Eepget은 느리거나 불안정안 네트워크를 통해서도 파일을 운
 
 .SH "EXIT STATUS"
 
-\fBeepget\fP exits with status zero upon successful transfer and non\-zero if
-there were problems with the download.
+\fBeepget\fP은 정상적인 전송때에는 0 상태로 종료되며 다운로드에 문제가 있을 때는 0이 아닙니다.
 
 .SH "REPORTING BUGS"
-Please enter a ticket on
 .UR https://trac.i2p2.de/
-the I2P trac page
+I2P trac 페이지
 .UE .
+에 티켓을 남겨 주세요
 
 .SH "SEE ALSO"
 \fBi2prouter\fP(1)  \fBcurl\fP(1)  \fBwget\fP(1)
diff --git a/installer/resources/man/eepget.pl.1 b/installer/resources/man/eepget.pl.1
new file mode 100644
index 000000000..4606224e9
--- /dev/null
+++ b/installer/resources/man/eepget.pl.1
@@ -0,0 +1,95 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH EEPGET 1 "26 stycznia 2017" "" I2P
+
+.SH NAZWA
+Eepget \- asystent pobierania I2P
+
+.SH STRESZCZENIE
+\fBeepget\fP [\fIopcje\fP]\fIURL\fP
+.br
+
+.SH OPIS
+.P
+Pobiera plik niezależnie przez HTTP. Zarówno transfery przez I2P i przez
+zwykły Internet są wspierane.
+.P
+Eepget pozwala poradzić sobie z powolnym lub niestabilnym połączeniem;
+jeżeli pobieranie nie powiedzie się z powodu problemu z połączeniem,
+zostanie ono wznowione (jeżeli opcja \-n jest aktywna). Jeżeli jest to
+wspierane przez serwer, eepget spróbuje pobrać plik od miejsca w którym
+pobieranie zostało przerwane.
+
+.SH OPCJE
+\fB\-c\fP
+.TP 
+Clearnet (zwykły Internet). Nie używa proxy. To samo co \fB\-p\fP :0.
+.TP 
+
+\fB\-e\fP etag
+.TP 
+Ustawia wartość etag w nagłówku żądania.
+.TP 
+
+\fB\-h\fP nazwa=wartość
+.TP 
+Dodaje dowolny nagłówek żądania z podaną nazwą i wartością.
+.TP 
+
+\fB\-l\fP długość_linii
+.TP 
+Dostosowuje wyświetlanie postępu. \fB\ lineLen \fP jest długością (w znakach) jednej linii paska postępu. Domyślnie 40.
+.TP 
+
+\fB\-m\fP rozmiar_znaku
+.TP 
+Dostosowuje wyświetlanie postępu. \fB\ markSize \fP jest liczbą bajtów reprezentowanych przez jeden znak '#'. Domyślnie 1024.
+.TP 
+
+\fB\-n\fP prób
+.TP 
+Określa ile razy spróbować ponownie pobierania w przypadku niepowodzenia. Jeżeli ta opcja nie zostanie podana, eepget nie spróbuje ponownie.
+.TP 
+
+\fB\-o\fP plik_wyjściowy
+.TP 
+Określa plik wyjściowy do zapisu. Jeżeli ta opcja nie zostanie sprecyzowana, wyjściowa nazwa pliku będzie taka sama jak pierwotna z URL.
+.TP 
+
+\fB\-p\fP proxy_host[:port]
+.TP 
+Określa używane proxy I2P (eeproxy). Jeżeli port nie zostanie podany, eepget użyje 4444. Jeżeli ta opcja nie zostanie określona, eepget użyje 127.0.0.1:4444. Określ \fB\-c\fP lub \fB\-p\fP:0, aby wyłączyć eeproxy.
+.TP 
+
+\fB\-t\fP sekundy
+.TP 
+Określa limit czasu nieaktywności. Domyślnie 60 sekund.
+.TP 
+
+\fB\-u\fP użytkownik
+.TP 
+Ustawia nazwę użytkownika dla autoryzacji proxy (jeżeli konieczna).
+.TP 
+
+\fB\-x\fP hasło
+.TP 
+Ustawia hasło dla autoryzacji proxy (jeżeli konieczna). Jeżeli nazwa użytkownika jest określona, ale nie hasło, eepget zapyta o hasło.
+.TP 
+
+.SH "KOD WYJŚCIOWY"
+
+\fBeepget\fP kończy pracę z kodem zero po pomyślnym pobraniu i z kodem
+nie\-zerowym jeżeli wystąpiły problemy z pobieraniem.
+
+.SH "ZGŁASZANIE BŁĘDÓW"
+Prosimy zgłosić błąd na
+.UR https://trac.i2p2.de/
+stronie I2P trac
+.UE .
+
+.SH "ZOBACZ TAKŻE"
+\fBi2prouter\fP(1) \fBcurl\fP(1) \fBwget\fP(1)
+
diff --git a/installer/resources/man/eepget.pt_BR.1 b/installer/resources/man/eepget.pt_BR.1
new file mode 100644
index 000000000..a8c5fef3c
--- /dev/null
+++ b/installer/resources/man/eepget.pt_BR.1
@@ -0,0 +1,95 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH EEPGET 1 "26 de Janeiro de 2017" "" I2P
+
+.SH NOME
+Eepget \- I2P downloader
+
+.SH SINOPSE
+\fBeepget\fP [\fIoptions\fP]\fIURL\fP
+.br
+
+.SH DESCRIÇÃO
+.P
+Download a file non\-interactively via HTTP. Transfers through both I2P and
+the regular Internet are supported.
+.P
+Eepget is able to cope with slow or unstable network connections; if a
+download is not successful because of a network problem, it will keep
+retrying until the whole file has been retrieved (if the \-n option is set).
+If supported by the remote server, eepget will instruct the server to
+continue the download from the point of interruption.
+
+.SH OPÇÕES
+\fB\-c\fP
+.TP 
+Clearnet. Do not use a proxy. Same as \fB\-p\fP :0 .
+.TP 
+
+\fB\-e\fP etag
+.TP 
+Sets the etag value in the request headers.
+.TP 
+
+\fB\-h\fP name=value
+.TP 
+Adds an arbitrary request header with the given name and value.
+.TP 
+
+\fB\-l\fP lineLen
+.TP 
+Controls the progress display. \fB\ lineLen \fP is the length of one progress line in characters. The default is 40.
+.TP 
+
+\fB\-m\fP markSize
+.TP 
+Controls the progress display. \fB\ markSize \fP is the number of bytes one '#' character represents. The default is 1024.
+.TP 
+
+\fB\-n\fP retries
+.TP 
+Specify the number of times to retry downloading if the download isn't successful. If this option is not specified, eepget will not retry.
+.TP 
+
+\fB\-o\fP file
+.TP 
+Sets the output file to write to. If this option is not given, the output filename will be determined by the URL.
+.TP 
+
+\fB\-p\fP proxy_host[:port]
+.TP 
+Specify an I2P proxy server (eeproxy) to use. If the port is not specified, eepget will use 4444. If this option is not specified, eepget will use 127.0.0.1:4444. Specify \fB\-c\fP or \fB\-p\fP :0 to disable the eeproxy.
+.TP 
+
+\fB\-t\fP seconds
+.TP 
+Sets the inactivity timeout. The default is 60 seconds.
+.TP 
+
+\fB\-u\fP username
+.TP 
+Sets the username for proxy authorization, if required.
+.TP 
+
+\fB\-x\fP password
+.TP 
+Sets the password for proxy authorization, if required. If a username is specified but not a password, EepGet will prompt for the password.
+.TP 
+
+.SH "EXIT STATUS"
+
+\fBeepget\fP exits with status zero upon successful transfer and non\-zero if
+there were problems with the download.
+
+.SH "REPORTING BUGS"
+Please enter a ticket on
+.UR https://trac.i2p2.de/
+the I2P trac page
+.UE .
+
+.SH "VER TAMBÉM"
+\fBi2prouter\fP(1)  \fBcurl\fP(1)  \fBwget\fP(1)
+
diff --git a/installer/resources/man/eepget.ru.1 b/installer/resources/man/eepget.ru.1
new file mode 100644
index 000000000..e29bf43cb
--- /dev/null
+++ b/installer/resources/man/eepget.ru.1
@@ -0,0 +1,95 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH EEPGET 1 "26 января 2017" "" I2P
+
+.SH NAME
+Eepget \- I2P downloader
+
+.SH SYNOPSIS
+\fBeepget\fP [\fIoptions\fP]\fIURL\fP
+.br
+
+.SH ОПИСАНИЕ
+.P
+Download a file non\-interactively via HTTP. Transfers through both I2P and
+the regular Internet are supported.
+.P
+Eepget is able to cope with slow or unstable network connections; if a
+download is not successful because of a network problem, it will keep
+retrying until the whole file has been retrieved (if the \-n option is set).
+If supported by the remote server, eepget will instruct the server to
+continue the download from the point of interruption.
+
+.SH OPTIONS
+\fB\-c\fP
+.TP 
+Clearnet. Do not use a proxy. Same as \fB\-p\fP :0 .
+.TP 
+
+\fB\-e\fP etag
+.TP 
+Sets the etag value in the request headers.
+.TP 
+
+\fB\-h\fP name=value
+.TP 
+Adds an arbitrary request header with the given name and value.
+.TP 
+
+\fB\-l\fP lineLen
+.TP 
+Controls the progress display. \fB\ lineLen \fP is the length of one progress line in characters. The default is 40.
+.TP 
+
+\fB\-m\fP markSize
+.TP 
+Controls the progress display. \fB\ markSize \fP is the number of bytes one '#' character represents. The default is 1024.
+.TP 
+
+\fB\-n\fP retries
+.TP 
+Specify the number of times to retry downloading if the download isn't successful. If this option is not specified, eepget will not retry.
+.TP 
+
+\fB\-o\fP file
+.TP 
+Sets the output file to write to. If this option is not given, the output filename will be determined by the URL.
+.TP 
+
+\fB\-p\fP proxy_host[:port]
+.TP 
+Specify an I2P proxy server (eeproxy) to use. If the port is not specified, eepget will use 4444. If this option is not specified, eepget will use 127.0.0.1:4444. Specify \fB\-c\fP or \fB\-p\fP :0 to disable the eeproxy.
+.TP 
+
+\fB\-t\fP seconds
+.TP 
+Sets the inactivity timeout. The default is 60 seconds.
+.TP 
+
+\fB\-u\fP username
+.TP 
+Sets the username for proxy authorization, if required.
+.TP 
+
+\fB\-x\fP password
+.TP 
+Sets the password for proxy authorization, if required. If a username is specified but not a password, EepGet will prompt for the password.
+.TP 
+
+.SH "EXIT STATUS"
+
+\fBeepget\fP exits with status zero upon successful transfer and non\-zero if
+there were problems with the download.
+
+.SH "REPORTING BUGS"
+Please enter a ticket on
+.UR https://trac.i2p2.de/
+the I2P trac page
+.UE .
+
+.SH "СМ. ТАКЖЕ"
+\fBi2prouter\fP(1)  \fBcurl\fP(1)  \fBwget\fP(1)
+
diff --git a/installer/resources/man/eepget.sv.1 b/installer/resources/man/eepget.sv.1
new file mode 100644
index 000000000..992fafde6
--- /dev/null
+++ b/installer/resources/man/eepget.sv.1
@@ -0,0 +1,95 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH EEPGET 1 "January 26, 2017" "" I2P
+
+.SH NAME
+Eepget \- I2P downloader
+
+.SH SYNOPSIS
+\fBeepget\fP [\fIoptions\fP]\fIURL\fP
+.br
+
+.SH DESCRIPTION
+.P
+Download a file non\-interactively via HTTP. Transfers through both I2P and
+the regular Internet are supported.
+.P
+Eepget is able to cope with slow or unstable network connections; if a
+download is not successful because of a network problem, it will keep
+retrying until the whole file has been retrieved (if the \-n option is set).
+If supported by the remote server, eepget will instruct the server to
+continue the download from the point of interruption.
+
+.SH OPTIONS
+\fB\-c\fP
+.TP 
+Clearnet. Do not use a proxy. Same as \fB\-p\fP :0 .
+.TP 
+
+\fB\-e\fP etag
+.TP 
+Sets the etag value in the request headers.
+.TP 
+
+\fB\-h\fP name=value
+.TP 
+Adds an arbitrary request header with the given name and value.
+.TP 
+
+\fB\-l\fP lineLen
+.TP 
+Controls the progress display. \fB\ lineLen \fP is the length of one progress line in characters. The default is 40.
+.TP 
+
+\fB\-m\fP markSize
+.TP 
+Controls the progress display. \fB\ markSize \fP is the number of bytes one '#' character represents. The default is 1024.
+.TP 
+
+\fB\-n\fP retries
+.TP 
+Specify the number of times to retry downloading if the download isn't successful. If this option is not specified, eepget will not retry.
+.TP 
+
+\fB\-o\fP file
+.TP 
+Sets the output file to write to. If this option is not given, the output filename will be determined by the URL.
+.TP 
+
+\fB\-p\fP proxy_host[:port]
+.TP 
+Specify an I2P proxy server (eeproxy) to use. If the port is not specified, eepget will use 4444. If this option is not specified, eepget will use 127.0.0.1:4444. Specify \fB\-c\fP or \fB\-p\fP :0 to disable the eeproxy.
+.TP 
+
+\fB\-t\fP seconds
+.TP 
+Sets the inactivity timeout. The default is 60 seconds.
+.TP 
+
+\fB\-u\fP username
+.TP 
+Sets the username for proxy authorization, if required.
+.TP 
+
+\fB\-x\fP password
+.TP 
+Sets the password for proxy authorization, if required. If a username is specified but not a password, EepGet will prompt for the password.
+.TP 
+
+.SH "EXIT STATUS"
+
+\fBeepget\fP exits with status zero upon successful transfer and non\-zero if
+there were problems with the download.
+
+.SH "REPORTING BUGS"
+Please enter a ticket on
+.UR https://trac.i2p2.de/
+the I2P trac page
+.UE .
+
+.SH "SEE ALSO"
+\fBi2prouter\fP(1)  \fBcurl\fP(1)  \fBwget\fP(1)
+
diff --git a/installer/resources/man/eepget.zh.1 b/installer/resources/man/eepget.zh.1
index b77f7e6ca..6f10bc7c9 100644
--- a/installer/resources/man/eepget.zh.1
+++ b/installer/resources/man/eepget.zh.1
@@ -52,7 +52,7 @@ Specify the number of times to retry downloading if the download isn't successfu
 
 \fB\-o\fP 文件
 .TP 
-Sets the output file to write to. If this option is not given, the output filename will be determined by the URL.
+设置要写入的输出文件。 如果未指定此选项，输出文件名将由URL确定。
 .TP 
 
 \fB\-p\fP proxy_host[:port]
diff --git a/installer/resources/man/i2prouter-nowrapper.it.1 b/installer/resources/man/i2prouter-nowrapper.it.1
index c0486bf70..774da433c 100644
--- a/installer/resources/man/i2prouter-nowrapper.it.1
+++ b/installer/resources/man/i2prouter-nowrapper.it.1
@@ -6,7 +6,7 @@
 .TH I2PROUTER\-NOWRAPPER 1 "26 Gennaio 2017" "" I2P
 
 .SH NOME
-i2prouter\-nowrapper \- start the I2P router
+i2prouter\-nowrapper \- avvia il router I2P
 
 .SH SINOSSI
 \fBi2prouter\-nowrapper\fP
@@ -23,11 +23,11 @@ options.  To stop the router, use your browser to access
 the router console
 .UE .
 
-.SH "REPORTING BUGS"
+.SH "SEGNALAZIONE BUG"
 Please enter a ticket on
 .UR https://trac.i2p2.de/
 the I2P trac page
 .UE .
 
-.SH "SEE ALSO"
+.SH "VEDI ANCHE"
 \fBi2prouter\fP(1)
diff --git a/installer/resources/man/i2prouter-nowrapper.ko.1 b/installer/resources/man/i2prouter-nowrapper.ko.1
index 9918daaa4..5248675df 100644
--- a/installer/resources/man/i2prouter-nowrapper.ko.1
+++ b/installer/resources/man/i2prouter-nowrapper.ko.1
@@ -6,28 +6,27 @@
 .TH I2PROUTER\-NOWRAPPER 1 "2017년 1월 26일" "" I2P
 
 .SH 이름
-i2prouter\-nowrapper \- start the I2P router
+i2prouter\-nowrapper \- I2P 라우터를 시작
 
 .SH SYNOPSIS
 \fBi2prouter\-nowrapper\fP
 .br
 
 .SH 설명
-Start the I2P router, without the service wrapper.  This means the router
-will not restart if it crashes.  Also, it will use the default memory size,
-which may not be enough for I2P.
+Service wrapper 없이 I2P 라우터를 시작. 오류가 난다면 시작되지 않습니다. I2P 구동에 충분하지 않은 기본 메모리
+사이즈를 사용합니다.
 .P
-You should really use the \fBi2prouter\fP(1)  script instead.  There are no
-options.  To stop the router, use your browser to access
+\fBi2prouter\fP(1)를 사용해야 합니다. 다른 선택지는 없습니다. 라우터를 멈추려면, 브라우저를 통해
 .UR http://localhost:7657/
-the router console
+라우터 콘솔
 .UE .
+에 접근하세요.
 
 .SH "REPORTING BUGS"
-Please enter a ticket on
 .UR https://trac.i2p2.de/
-the I2P trac page
+I2P trac 페이지
 .UE .
+에 티켓을 남겨 주세요
 
 .SH "SEE ALSO"
 \fBi2prouter\fP(1)
diff --git a/installer/resources/man/i2prouter-nowrapper.pl.1 b/installer/resources/man/i2prouter-nowrapper.pl.1
new file mode 100644
index 000000000..5aeaecfb8
--- /dev/null
+++ b/installer/resources/man/i2prouter-nowrapper.pl.1
@@ -0,0 +1,33 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH I2PROUTER\-NOWRAPPER 1 "26 stycznia 2017" "" I2P
+
+.SH NAZWA
+i2prouter\-nowrapper \- uruchom węzeł I2P
+
+.SH STRESZCZENIE
+\fBi2prouter\-nowrapper\fP
+.br
+
+.SH OPIS
+Uruchamia węzeł I2P bez usługi wrappera. To oznacza, że węzeł I2P nie
+zrestartuje się w razie awarii. Zostanie także użyta domyślna ilość pamięci,
+która może być niewystarczająca dla I2P.
+.P
+Naprawdę powinieneś zamiast tego użyć skryptu \fBi2prouter\fP(1). Tutaj nie ma
+opcji. Aby zatrzymać węzeł, użyj przeglądarki i wywołaj
+.UR http://localhost:7657/
+konsolę węzła
+.UE .
+
+.SH "ZGŁASZANIE BŁĘDÓW"
+Prosimy zgłosić błąd na
+.UR https://trac.i2p2.de/
+stronie I2P trac
+.UE .
+
+.SH "ZOBACZ TAKŻE"
+\fBi2prouter\fP(1)
diff --git a/installer/resources/man/i2prouter-nowrapper.pt_BR.1 b/installer/resources/man/i2prouter-nowrapper.pt_BR.1
new file mode 100644
index 000000000..9a4c20382
--- /dev/null
+++ b/installer/resources/man/i2prouter-nowrapper.pt_BR.1
@@ -0,0 +1,33 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH I2PROUTER\-NOWRAPPER 1 "26 de Janeiro de 2017" "" I2P
+
+.SH NOME
+i2prouter\-nowrapper \- start the I2P router
+
+.SH SINOPSE
+\fBi2prouter\-nowrapper\fP
+.br
+
+.SH DESCRIÇÃO
+Start the I2P router, without the service wrapper.  This means the router
+will not restart if it crashes.  Also, it will use the default memory size,
+which may not be enough for I2P.
+.P
+You should really use the \fBi2prouter\fP(1)  script instead.  There are no
+options.  To stop the router, use your browser to access
+.UR http://localhost:7657/
+the router console
+.UE .
+
+.SH "REPORTING BUGS"
+Please enter a ticket on
+.UR https://trac.i2p2.de/
+the I2P trac page
+.UE .
+
+.SH "VER TAMBÉM"
+\fBi2prouter\fP(1)
diff --git a/installer/resources/man/i2prouter-nowrapper.ru.1 b/installer/resources/man/i2prouter-nowrapper.ru.1
new file mode 100644
index 000000000..fcf5e75a7
--- /dev/null
+++ b/installer/resources/man/i2prouter-nowrapper.ru.1
@@ -0,0 +1,33 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH I2PROUTER\-NOWRAPPER 1 "26 января 2017" "" I2P
+
+.SH NAME
+i2prouter\-nowrapper \- start the I2P router
+
+.SH SYNOPSIS
+\fBi2prouter\-nowrapper\fP
+.br
+
+.SH ОПИСАНИЕ
+Start the I2P router, without the service wrapper.  This means the router
+will not restart if it crashes.  Also, it will use the default memory size,
+which may not be enough for I2P.
+.P
+You should really use the \fBi2prouter\fP(1)  script instead.  There are no
+options.  To stop the router, use your browser to access
+.UR http://localhost:7657/
+the router console
+.UE .
+
+.SH "REPORTING BUGS"
+Please enter a ticket on
+.UR https://trac.i2p2.de/
+the I2P trac page
+.UE .
+
+.SH "СМ. ТАКЖЕ"
+\fBi2prouter\fP(1)
diff --git a/installer/resources/man/i2prouter-nowrapper.sv.1 b/installer/resources/man/i2prouter-nowrapper.sv.1
new file mode 100644
index 000000000..10bf94017
--- /dev/null
+++ b/installer/resources/man/i2prouter-nowrapper.sv.1
@@ -0,0 +1,33 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH I2PROUTER\-NOWRAPPER 1 "January 26, 2017" "" I2P
+
+.SH NAME
+i2prouter\-nowrapper \- start the I2P router
+
+.SH SYNOPSIS
+\fBi2prouter\-nowrapper\fP
+.br
+
+.SH DESCRIPTION
+Start the I2P router, without the service wrapper.  This means the router
+will not restart if it crashes.  Also, it will use the default memory size,
+which may not be enough for I2P.
+.P
+You should really use the \fBi2prouter\fP(1)  script instead.  There are no
+options.  To stop the router, use your browser to access
+.UR http://localhost:7657/
+the router console
+.UE .
+
+.SH "REPORTING BUGS"
+Please enter a ticket on
+.UR https://trac.i2p2.de/
+the I2P trac page
+.UE .
+
+.SH "SEE ALSO"
+\fBi2prouter\fP(1)
diff --git a/installer/resources/man/i2prouter.it.1 b/installer/resources/man/i2prouter.it.1
index b7e45f096..cba030a2b 100644
--- a/installer/resources/man/i2prouter.it.1
+++ b/installer/resources/man/i2prouter.it.1
@@ -6,7 +6,7 @@
 .TH I2PROUTER 1 "26 Gennaio 2017" "" I2P
 
 .SH NOME
-i2prouter \- start and stop the I2P router
+i2prouter \- lancia e termina il router I2P
 
 .SH SINOSSI
 \fBi2prouter\fP
@@ -14,19 +14,19 @@ i2prouter \- start and stop the I2P router
 .br
 
 .SH DESCRIZIONE
-Control the I2P service.
+Permette di controllare il servizio I2P.
 
 .IP \fBconsole\fP
 Runs I2P as a console application under the current user.
 
 .IP \fBstart\fP
-Starts the I2P service.
+Avvia il servizio I2P.
 
 .IP \fBstop\fP
-Stops the I2P service.
+Arresta il servizio I2P.
 
 .IP \fBrestart\fP
-Stops the I2P service and then starts it.
+Arresta e poi riavvia il servizio I2P.
 
 .IP \fBcondrestart\fP
 Restart the I2P service only if it is already running.
@@ -41,16 +41,16 @@ Install initscript to start I2P automatically when the system boots.
 Uninstall initscript that was installed with \fBinstall\fP
 
 .IP \fBstatus\fP
-Prints whether the I2P service is running.
+Scrive se il servizio I2P è in esecuzione.
 
 .IP \fBdump\fP
 Dumps the current threads into \fBwrapper.log\fP.
 
-.SH "REPORTING BUGS"
+.SH "SEGNALAZIONE BUG"
 Please enter a ticket on
 .UR https://trac.i2p2.de/
 the I2P trac page
 .UE .
 
-.SH "SEE ALSO"
+.SH "VEDI ANCHE"
 \fBi2prouter\-nowrapper\fP(1)
diff --git a/installer/resources/man/i2prouter.ko.1 b/installer/resources/man/i2prouter.ko.1
index ce4b89275..61da7e13f 100644
--- a/installer/resources/man/i2prouter.ko.1
+++ b/installer/resources/man/i2prouter.ko.1
@@ -6,7 +6,7 @@
 .TH I2PROUTER 1 "2017년 1월 26일" "" I2P
 
 .SH 이름
-i2prouter \- start and stop the I2P router
+i2prouter \- I2P 라우터를 시작하거나 중지할 때 사용
 
 .SH SYNOPSIS
 \fBi2prouter\fP
@@ -14,43 +14,43 @@ i2prouter \- start and stop the I2P router
 .br
 
 .SH 설명
-Control the I2P service.
+I2P 서비스를 조정
 
 .IP \fBconsole\fP
-Runs I2P as a console application under the current user.
+현재 유저로 I2P를 콘솔 애플리케이션으로 동작시킴
 
 .IP \fBstart\fP
-Starts the I2P service.
+I2P 서비스를 시작
 
 .IP \fBstop\fP
-Stops the I2P service.
+I2P 서비스를 중지
 
 .IP \fBrestart\fP
-Stops the I2P service and then starts it.
+I2P 서비스를 종료하고 재시작
 
 .IP \fBcondrestart\fP
-Restart the I2P service only if it is already running.
+I2P 서비스가 실행중이라면 재시작
 
 .IP \fBgraceful\fP
-Stop I2P gracefully (may take up to 11 minutes)
+우아하게 종료 (11분 이상 걸릴 수 있음)
 
 .IP \fBinstall\fP
-Install initscript to start I2P automatically when the system boots.
+시스템이 켜짐젼 I2P를 자동 시작하게끔 initscript를 설치
 
 .IP \fBremove\fP
-Uninstall initscript that was installed with \fBinstall\fP
+\fBinstall\fP로 설치된 initscript를 삭제
 
 .IP \fBstatus\fP
-Prints whether the I2P service is running.
+I2P 작동 여부를 출력
 
 .IP \fBdump\fP
-Dumps the current threads into \fBwrapper.log\fP.
+\fBwrapper.log\fP에 현재 쓰레드를 덤프
 
 .SH "REPORTING BUGS"
-Please enter a ticket on
 .UR https://trac.i2p2.de/
-the I2P trac page
+I2P trac 페이지
 .UE .
+에 티켓을 남겨 주세요
 
 .SH "SEE ALSO"
 \fBi2prouter\-nowrapper\fP(1)
diff --git a/installer/resources/man/i2prouter.pl.1 b/installer/resources/man/i2prouter.pl.1
new file mode 100644
index 000000000..8eaa8c6b1
--- /dev/null
+++ b/installer/resources/man/i2prouter.pl.1
@@ -0,0 +1,57 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH I2PROUTER 1 "26 stycznia 2017" "" I2P
+
+.SH NAZWA
+I2prouter \- uruchom i zatrzymaj węzeł I2P
+
+.SH STRESZCZENIE
+\fBi2prouter\fP
+{\fIconsole\fP|\fIstart\fP|\fIstop\fP|\fIgraceful\fP|\fIrestart\fP|\fIcondrestart\fP|\fIstatus\fP|\fIdump\fP|\fIinstall\fP|\fIremove\fP}
+.br
+
+.SH OPIS
+Zarządza usługą I2P.
+
+.IP \fBconsole\fP
+Uruchamia I2P jako aplikację konsoli jako obecny użytkownik.
+
+.IP \fBstart\fP
+Uruchamia usługę I2P.
+
+.IP \fBstop\fP
+Zatrzymuje usługę I2P.
+
+.IP \fBrestart\fP
+Zatrzymuje i uruchamia ponownie usługę I2P.
+
+.IP \fBcondrestart\fP
+Restartuje usługę I2P tylko jeżeli jest już uruchomiona.
+
+.IP \fBgraceful\fP
+Elegancko zatrzymuje I2P (może potrwać do 11 minut).
+
+.IP \fBinstall\fP
+Instaluje initscript, aby uruchamiać I2P automatycznie podczas startu
+systemu.
+
+.IP \fBremove\fP
+Usuwa initscript zainstalowany poprzez polecenie \fBinstall\fP.
+
+.IP \fBstatus\fP
+Wyświetla czy usługa I2P jest uruchomiona.
+
+.IP \fBdump\fP
+Zrzuca działające wątki do \fBwrapper.log\fP.
+
+.SH "ZGŁASZANIE BŁĘDÓW"
+Prosimy zgłosić błąd na
+.UR https://trac.i2p2.de/
+stronie I2P trac
+.UE .
+
+.SH "ZOBACZ TAKŻE"
+\fBi2prouter\-nowrapper\fP(1)
diff --git a/installer/resources/man/i2prouter.pt_BR.1 b/installer/resources/man/i2prouter.pt_BR.1
new file mode 100644
index 000000000..c0e4f2c26
--- /dev/null
+++ b/installer/resources/man/i2prouter.pt_BR.1
@@ -0,0 +1,56 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH I2PROUTER 1 "26 de Janeiro de 2017" "" I2P
+
+.SH NOME
+i2prouter \- start and stop the I2P router
+
+.SH SINOPSE
+\fBi2prouter\fP
+{\fIconsole\fP|\fIstart\fP|\fIstop\fP|\fIgraceful\fP|\fIrestart\fP|\fIcondrestart\fP|\fIstatus\fP|\fIdump\fP|\fIinstall\fP|\fIremove\fP}
+.br
+
+.SH DESCRIÇÃO
+Control the I2P service.
+
+.IP \fBconsole\fP
+Runs I2P as a console application under the current user.
+
+.IP \fBstart\fP
+Starts the I2P service.
+
+.IP \fBstop\fP
+Stops the I2P service.
+
+.IP \fBrestart\fP
+Stops the I2P service and then starts it.
+
+.IP \fBcondrestart\fP
+Restart the I2P service only if it is already running.
+
+.IP \fBgraceful\fP
+Stop I2P gracefully (may take up to 11 minutes)
+
+.IP \fBinstall\fP
+Install initscript to start I2P automatically when the system boots.
+
+.IP \fBremove\fP
+Uninstall initscript that was installed with \fBinstall\fP
+
+.IP \fBstatus\fP
+Prints whether the I2P service is running.
+
+.IP \fBdump\fP
+Dumps the current threads into \fBwrapper.log\fP.
+
+.SH "REPORTING BUGS"
+Please enter a ticket on
+.UR https://trac.i2p2.de/
+the I2P trac page
+.UE .
+
+.SH "VER TAMBÉM"
+\fBi2prouter\-nowrapper\fP(1)
diff --git a/installer/resources/man/i2prouter.ru.1 b/installer/resources/man/i2prouter.ru.1
new file mode 100644
index 000000000..b3f176636
--- /dev/null
+++ b/installer/resources/man/i2prouter.ru.1
@@ -0,0 +1,56 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH I2PROUTER 1 "26 января 2017" "" I2P
+
+.SH NAME
+i2prouter \- start and stop the I2P router
+
+.SH SYNOPSIS
+\fBi2prouter\fP
+{\fIconsole\fP|\fIstart\fP|\fIstop\fP|\fIgraceful\fP|\fIrestart\fP|\fIcondrestart\fP|\fIstatus\fP|\fIdump\fP|\fIinstall\fP|\fIremove\fP}
+.br
+
+.SH ОПИСАНИЕ
+Control the I2P service.
+
+.IP \fBconsole\fP
+Runs I2P as a console application under the current user.
+
+.IP \fBstart\fP
+Запускает сервис I2P
+
+.IP \fBstop\fP
+Останавливает сервис I2P
+
+.IP \fBrestart\fP
+Останавливает сервис I2P и затем запускет его.
+
+.IP \fBcondrestart\fP
+Перезапускает сервис I2P, только если он уже запущен.
+
+.IP \fBgraceful\fP
+Постепенно остановить сервис I2P (может занять до 11 минут)
+
+.IP \fBinstall\fP
+Install initscript to start I2P automatically when the system boots.
+
+.IP \fBremove\fP
+Uninstall initscript that was installed with \fBinstall\fP
+
+.IP \fBstatus\fP
+Сообщает, запущен ли I2P сервис.
+
+.IP \fBdump\fP
+Dumps the current threads into \fBwrapper.log\fP.
+
+.SH "REPORTING BUGS"
+Please enter a ticket on
+.UR https://trac.i2p2.de/
+the I2P trac page
+.UE .
+
+.SH "СМ. ТАКЖЕ"
+\fBi2prouter\-nowrapper\fP(1)
diff --git a/installer/resources/man/i2prouter.sv.1 b/installer/resources/man/i2prouter.sv.1
new file mode 100644
index 000000000..caee8e6f8
--- /dev/null
+++ b/installer/resources/man/i2prouter.sv.1
@@ -0,0 +1,56 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH I2PROUTER 1 "January 26, 2017" "" I2P
+
+.SH NAME
+i2prouter \- start and stop the I2P router
+
+.SH SYNOPSIS
+\fBi2prouter\fP
+{\fIconsole\fP|\fIstart\fP|\fIstop\fP|\fIgraceful\fP|\fIrestart\fP|\fIcondrestart\fP|\fIstatus\fP|\fIdump\fP|\fIinstall\fP|\fIremove\fP}
+.br
+
+.SH DESCRIPTION
+Control the I2P service.
+
+.IP \fBconsole\fP
+Runs I2P as a console application under the current user.
+
+.IP \fBstart\fP
+Startar I2P\-tjänsten.
+
+.IP \fBstop\fP
+Stoppar I2P\-tjänsten.
+
+.IP \fBrestart\fP
+Stoppar I2P\-tjänsten och startar den sedan.
+
+.IP \fBcondrestart\fP
+Startar om I2P\-tjänsten endast om den redan körs.
+
+.IP \fBgraceful\fP
+Stoppar I2P varsamt (kan ta upp till 11 minuter)
+
+.IP \fBinstall\fP
+Install initscript to start I2P automatically when the system boots.
+
+.IP \fBremove\fP
+Uninstall initscript that was installed with \fBinstall\fP
+
+.IP \fBstatus\fP
+Prints whether the I2P service is running.
+
+.IP \fBdump\fP
+Dumps the current threads into \fBwrapper.log\fP.
+
+.SH "REPORTING BUGS"
+Please enter a ticket on
+.UR https://trac.i2p2.de/
+the I2P trac page
+.UE .
+
+.SH "SEE ALSO"
+\fBi2prouter\-nowrapper\fP(1)
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
diff --git a/router/java/src/net/i2p/router/RouterThrottleImpl.java b/router/java/src/net/i2p/router/RouterThrottleImpl.java
index e4cdfb889..eb31bc6b2 100644
--- a/router/java/src/net/i2p/router/RouterThrottleImpl.java
+++ b/router/java/src/net/i2p/router/RouterThrottleImpl.java
@@ -8,6 +8,7 @@ import net.i2p.stat.RateAverages;
 import net.i2p.stat.RateStat;
 import net.i2p.util.Log;
 import net.i2p.util.SimpleTimer;
+import net.i2p.util.SystemVersion;
 
 /**
  * Simple throttle that basically stops accepting messages or nontrivial 
@@ -33,6 +34,8 @@ public class RouterThrottleImpl implements RouterThrottle {
     private static final String PROP_MAX_PROCESSINGTIME = "router.defaultProcessingTimeThrottle";
     private static final long DEFAULT_REJECT_STARTUP_TIME = 10*60*1000;
     private static final String PROP_REJECT_STARTUP_TIME = "router.rejectStartupTime";
+    private static final int DEFAULT_MIN_THROTTLE_TUNNELS = SystemVersion.isAndroid() ? 100 :
+                                                            SystemVersion.isARM() ? 500 : 1000;
 
     /**
      *  TO BE FIXED - SEE COMMENTS BELOW
@@ -197,8 +200,15 @@ public class RouterThrottleImpl implements RouterThrottle {
             return TunnelHistory.TUNNEL_REJECT_BANDWIDTH;
         }
 
-	// Throttle tunnels if min. throttle level is exceeded and default max participating tunnels (or fewer) is used.
-        if ((numTunnels > getMinThrottleTunnels()) && (DEFAULT_MAX_TUNNELS <= maxTunnels)) {
+        /*
+         * Throttle if we go above a minimum level of tunnels AND the maximum participating
+         * tunnels is default or lower.
+         *
+         * Lag based statistics use a moving average window (of for example 10 minutes), they are therefore
+         * sensitive to sudden rapid growth of load, which are not instantly detected by these metrics.
+         * Reduce tunnel growth if we are growing faster than the lag based metrics can detect reliably.
+         */
+        if ((numTunnels > getMinThrottleTunnels()) && (DEFAULT_MAX_TUNNELS >= maxTunnels)) {
             Rate avgTunnels = _context.statManager().getRate("tunnel.participatingTunnels").getRate(10*60*1000);
             if (avgTunnels != null) {
                 double avg = avgTunnels.getAvgOrLifetimeAvg();
@@ -458,7 +468,7 @@ public class RouterThrottleImpl implements RouterThrottle {
     
     /** dont ever probabalistically throttle tunnels if we have less than this many */
     private int getMinThrottleTunnels() { 
-        return _context.getProperty("router.minThrottleTunnels", 1000);
+        return _context.getProperty("router.minThrottleTunnels", DEFAULT_MIN_THROTTLE_TUNNELS);
     }
     
     private double getTunnelGrowthFactor() {
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 87e5bffca..ea17ad55f 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 1;
+    public final static long BUILD = 15;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/TunnelPoolSettings.java b/router/java/src/net/i2p/router/TunnelPoolSettings.java
index c7377629d..6e5152f9e 100644
--- a/router/java/src/net/i2p/router/TunnelPoolSettings.java
+++ b/router/java/src/net/i2p/router/TunnelPoolSettings.java
@@ -65,10 +65,7 @@ public class TunnelPoolSettings {
     public static final int     DEFAULT_DURATION = 10*60*1000;
     //public static final int     DEFAULT_LENGTH = SystemVersion.isAndroid() ? 2 : 3;
 
-    private static final boolean isSlow = SystemVersion.isGNU() ||
-                                          SystemVersion.isARM() ||
-                                          SystemVersion.isApache() ||
-                                          !NativeBigInteger.isNative();
+    private static final boolean isSlow = SystemVersion.isSlow();
 
     /** client only */
     private static final int    DEFAULT_IB_LENGTH = 3;
diff --git a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
index cc25b396c..aefcb0613 100644
--- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
+++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
@@ -108,19 +108,20 @@ public class Reseeder {
         //
         // https url:port, ending with "/"              // certificates/reseed/      // certificates/ssl/          // notes
         // ----------------------------------           ------------------------     -------------------------     ---------------
+        "https://randomrng.ddns.net/"         + ',' +   // randomrng_at_mail.i2p.crt // CA                         // Java 7+
         "https://itoopie.atomike.ninja/"      + ',' +   // atomike_at_mail.i2p.crt   // CA                         // Java 8+ only
         "https://reseed.onion.im/"            + ',' +   // lazygravy_at_mail.i2p     // reseed.onion.im.crt        // Java 8+ only
         "https://reseed.memcpy.io/"           + ',' +   // hottuna_at_mail.i2p.crt   // CA                         // SNI required
-        "https://reseed.atomike.ninja/"       + "," +   // atomike_at_mail.i2p.crt   // CA                         // SNI required, Java 8+ only
+        "https://reseed.atomike.ninja/"       + ',' +   // atomike_at_mail.i2p.crt   // CA                         // SNI required, Java 8+ only
         "https://i2p.manas.ca:8443/"          + ',' +   // zmx_at_mail.i2p.crt       // CA                         // SNI required
         "https://i2p-0.manas.ca:8443/"        + ',' +   // zmx_at_mail.i2p.crt       // CA                         // SNI required
         "https://reseed.i2p.vzaws.com:8443/"  + ',' +   // parg_at_mail.i2p.crt      // reseed.i2p.vzaws.com.crt
         "https://i2p.mooo.com/netDb/"         + ',' +   // bugme_at_mail.i2p.crt     // i2p.mooo.com.crt
-        "https://download.xxlspeed.com/"      + ',' +   // backup_at_mail.i2p.crt    // download.xxlspeed.com.crt  // SNI required
+        "https://download.xxlspeed.com/"      + ',' +   // backup_at_mail.i2p.crt    // CA                         // Java 8+
         "https://netdb.i2p2.no/"              + ',' +   // meeh_at_mail.i2p.crt      // netdb.i2p2.no.crt          // SNI required
         //"https://us.reseed.i2p2.no:444/"      + ',' +   // meeh_at_mail.i2p.crt      // us.reseed.i2p2.no.crt
         //"https://uk.reseed.i2p2.no:444/"      + ',' +   // meeh_at_mail.i2p.crt      // uk.reseed.i2p2.no.crt
-        "https://reseed.i2p-projekt.de/";               // echelon_at_mail.i2p.crt   // reseed.i2p-projekt.de.crt
+        "https://reseed.i2p-projekt.de/";               // echelon_at_mail.i2p.crt   // echelon.reseed2017.crt     // Java 8+
 
     private static final String SU3_FILENAME = "i2pseeds.su3";
 
diff --git a/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java b/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java
index 01ec4ce97..b834a1fbd 100644
--- a/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java
+++ b/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java
@@ -55,7 +55,7 @@ public class CreateRouterInfoJob extends JobImpl {
     public static final String KEYS2_FILENAME = "router.keys.dat";
     static final String PROP_ROUTER_SIGTYPE = "router.sigType";
     /** TODO make everybody Ed */
-    private static final SigType DEFAULT_SIGTYPE = (SystemVersion.isARM() || SystemVersion.isAndroid()) ?
+    private static final SigType DEFAULT_SIGTYPE = SystemVersion.isAndroid() ?
                                                    SigType.DSA_SHA1 : SigType.EdDSA_SHA512_Ed25519;
 
     CreateRouterInfoJob(RouterContext ctx, Job next) {
diff --git a/router/java/src/net/i2p/router/startup/MigrateJetty.java b/router/java/src/net/i2p/router/startup/MigrateJetty.java
index ed461c6ed..db6476baa 100644
--- a/router/java/src/net/i2p/router/startup/MigrateJetty.java
+++ b/router/java/src/net/i2p/router/startup/MigrateJetty.java
@@ -6,13 +6,25 @@ package net.i2p.router.startup;
  */
 
 import java.io.File;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.OutputStreamWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.List;
 
+import net.i2p.data.DataHelper;
 import net.i2p.router.RouterContext;
+import net.i2p.util.FileUtil;
+import net.i2p.util.I2PSSLSocketFactory;
+import net.i2p.util.SecureFileOutputStream;
+import net.i2p.util.VersionComparator;
 
 /**
  *  Migrate the clients.config and jetty.xml files
- *  from Jetty 5/6 to Jetty 7.
+ *  from Jetty 5/6 to Jetty 7/8.
+ *  Also migrate jetty.xml from Jetty 7/8 to Jetty 9.
  *
  *  For each client for class org.mortbay.jetty.Server:
  *<pre>
@@ -29,7 +41,8 @@ import net.i2p.router.RouterContext;
  *  Copies clients.config to clients.config.jetty6;
  *  Saves new clients.config.
  *
- *  Does NOT preserve port number, thread counts, etc.
+ *  Does NOT preserve port number, thread counts, etc. in the migration to 7/8.
+ *  DOES preserve everything in the migration to 9.
  *
  *  @since Jetty 6
  */
@@ -42,24 +55,43 @@ abstract class MigrateJetty {
     private static final String NEW_CLASS = "net.i2p.jetty.JettyStart";
     private static final String TEST_CLASS = "org.eclipse.jetty.server.Server";
     private static final String BACKUP_SUFFIX = ".jetty6";
-    private static final String JETTY_TEMPLATE_DIR = "eepsite-jetty7";
+    private static final String BACKUP_SUFFIX_8 = ".jetty8";
+    private static final String JETTY_TEMPLATE_DIR = "eepsite-jetty9";
     private static final String JETTY_TEMPLATE_PKGDIR = "eepsite";
     private static final String BASE_CONTEXT = "contexts/base-context.xml";
     private static final String CGI_CONTEXT = "contexts/cgi-context.xml";
+    private static final String PROP_JETTY9_MIGRATED = "router.startup.jetty9.migrated";
     
     /**
      *  For each entry in apps, if the main class is an old Jetty class,
      *  migrate it to the new Jetty class, and update the Jetty config files.
      */
     public static void migrate(RouterContext ctx, List<ClientAppConfig> apps) {
+        if (ctx.getBooleanProperty(PROP_JETTY9_MIGRATED))
+            return;
+        String installed = ctx.getProperty("router.firstVersion");
+        if (installed != null && VersionComparator.comp(installed, "0.9.30") >= 0) {
+            ctx.router().saveConfig(PROP_JETTY9_MIGRATED, "true");
+            return;
+        }
         boolean shouldSave = false;
+        boolean jetty9success = false;
         for (int i = 0; i < apps.size(); i++) {
             ClientAppConfig app = apps.get(i);
-            if (!(app.className.equals(OLD_CLASS) || app.className.equals(OLD_CLASS_6)))
+            String client;
+            String backupSuffix;
+            if (app.className.equals(NEW_CLASS)) {
+                client = "client application " + i + " [" + app.clientName +
+                         "] from Jetty 7/8 to Jetty 9";
+                backupSuffix = BACKUP_SUFFIX_8;
+            } else if (app.className.equals(OLD_CLASS) || app.className.equals(OLD_CLASS_6)) {
+                client = "client application " + i + " [" + app.clientName +
+                         "] from Jetty 5/6 " + app.className +
+                         " to Jetty 9 " + NEW_CLASS;
+                backupSuffix = BACKUP_SUFFIX;
+            } else {
                 continue;
-            String client = "client application " + i + " [" + app.clientName +
-                            "] from Jetty 5/6 " + app.className +
-                            " to Jetty 7 " + NEW_CLASS;
+            }
             if (!hasLatestJetty()) {
                 System.err.println("WARNING: Jetty 7 unavailable, cannot migrate " + client);
                 continue;
@@ -80,12 +112,38 @@ abstract class MigrateJetty {
                 continue;
             }
             File eepsite = xmlFile.getParentFile();
-            boolean ok = backupFile(xmlFile);
+            boolean ok = backupFile(xmlFile, backupSuffix);
             if (!ok) {
                 System.err.println("WARNING: Failed to backup up XML file " + xmlFile +
                                ", cannot migrate " + client);
                 continue;
             }
+            if (app.className.equals(NEW_CLASS)) {
+                // Do the migration of 8 to 9, handle additional command-line xml files too
+                for (int j = 0; j < args.length; j++) {
+                    if (j > 0) {
+                        // probably jetty-ssl.xml
+                        xmlFile = new File(args[j]);
+                        ok = backupFile(xmlFile, backupSuffix);
+                        if (!ok) {
+                            System.err.println("WARNING: Failed to backup up XML file " + xmlFile +
+                                               ", cannot migrate " + client);
+                            continue;
+                        }
+                    }
+                    boolean ok9 = migrateToJetty9(xmlFile);
+                    if (ok9) {
+                        System.err.println("WARNING: Migrated " + client + ".\n" +
+                                           "Check the " + xmlFile.getName() + " file in " + eepsite + ".\n" +
+                                           "Your old " + xmlFile.getName() + " file was backed up to " + xmlFile.getAbsolutePath() + BACKUP_SUFFIX_8);
+                        jetty9success = true;
+                    }
+                }
+                continue;
+            }
+
+            // Below here is migration of 5/6 to 9
+
             File baseEep = new File(ctx.getBaseDir(), JETTY_TEMPLATE_DIR);
             // in packages, or perhaps on an uninstall/reinstall, the files are in eepsite/
             if (!baseEep.exists())
@@ -141,12 +199,228 @@ abstract class MigrateJetty {
                 ClientAppConfig.writeClientAppConfig(ctx, apps);
                 System.err.println("WARNING: Migrated clients config file " + cfgFile +
                                " from Jetty 5/6 " + OLD_CLASS + '/' + OLD_CLASS_6 +
-                               " to Jetty 7 " + NEW_CLASS);
+                               " to Jetty 9 " + NEW_CLASS);
             }
         }
+        if (jetty9success)
+            ctx.router().saveConfig(PROP_JETTY9_MIGRATED, "true");
+    }
+
+    /**
+     *  Migrate a jetty.xml file to Jetty 9.
+     *  Unlike above, where we just migrate the new install file over for Jetty 9,
+     *  here we modify the xml file in-place to preserve settings where possible.
+     *
+     *  @return success
+     *  @since Jetty 9
+     */
+    private static boolean migrateToJetty9(File xmlFile) {
+        if (xmlFile.getName().equals("jetty-jmx.xml")) {
+            // This is lazy but nobody's using jmx, not worth the trouble
+            System.err.println("ERROR: Migration  of " + xmlFile +
+                               " file is not supported. Copy new file from $I2P/eepsite-jetty9/jetty-jmx.xml");
+            return false;
+        }
+        // we don't re-migrate from the template, we just add the
+        // necessary args for the QueuedThreadPool constructor in-place
+        // and fixup the renamed set call
+        boolean modified = false;
+        File eepsite = xmlFile.getParentFile();
+        File newFile = new File(eepsite, xmlFile.getName() + System.currentTimeMillis() + ".tmp");
+        FileInputStream in = null;
+        PrintWriter out = null;
+        try {
+            in = new FileInputStream(xmlFile);
+            out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(newFile), "UTF-8")));
+            String s;
+            boolean foundQTP = false;
+            boolean foundSTP = false;
+            boolean foundETP = false;
+            boolean foundSCC = false;
+            boolean foundHC = false;
+            boolean foundSSCC = false;
+            while ((s = DataHelper.readLine(in)) != null) {
+                // readLine() doesn't strip \r
+                if (s.endsWith("\r"))
+                    s = s.substring(0, s.length() - 1);
+                if (s.contains("Modified by I2P migration script for Jetty 9.") ||
+                    s.contains("This configuration supports Jetty 9.") ||
+                    s.contains("http://www.eclipse.org/jetty/configure_9_0.dtd")) {
+                    if (!modified)
+                        break;
+                    // else we've modified it twice?
+                } else if (s.contains("org.eclipse.jetty.util.thread.QueuedThreadPool")) {
+                    foundQTP = true;
+                } else if (foundQTP) {
+                    if (!(s.contains("Modified by") || s.contains("<Arg type=\"int\">"))) {
+                        out.println("        <!-- Modified by I2P migration script for Jetty 9. Do not remove this line -->");
+                        out.println("        <Arg type=\"int\">20</Arg>     <!-- maxThreads, overridden below -->");
+                        out.println("        <Arg type=\"int\">3</Arg>      <!-- minThreads, overridden below -->");
+                        out.println("        <Arg type=\"int\">60000</Arg>  <!-- maxIdleTimeMs, overridden below -->");
+                        modified = true;
+                    }
+                    foundQTP = false;
+                }
+                if (s.contains("<Set name=\"maxIdleTimeMs\">")) {
+                    // <Set name="maxIdleTimeMs">60000</Set>
+                    s = s.replace("<Set name=\"maxIdleTimeMs\">", "<Set name=\"idleTimeout\">");
+                    modified = true;
+                } else if (s.contains("<Set name=\"ThreadPool\">")) {
+                    // <Set name="ThreadPool">, must be changed to constructor arg
+                    out.println("    <!-- Modified by I2P migration script for Jetty 9. Do not remove this line -->");
+                    s = s.replace("<Set name=\"ThreadPool\">", "<Arg>");
+                    foundSTP = true;
+                    modified = true;
+                } else if (foundSTP && !foundETP && s.contains("</Set>") && !s.contains("<Set")) {
+                    // </Set> (close of <Set name="ThreadPool">)
+                    // All the lines above have <Set>...</Set> on the same line, if they don't, this will break.
+                    s = s.replace("</Set>", "</Arg>");
+                    foundETP = true;
+                } else if (s.contains("org.eclipse.jetty.server.nio.SelectChannelConnector")) {
+                    s = s.replace("org.eclipse.jetty.server.nio.SelectChannelConnector", "org.eclipse.jetty.server.ServerConnector");
+                    out.println("          <!-- Modified by I2P migration script for Jetty 9. Do not remove this line -->");
+                    out.println(s);
+                    out.println("            <Arg><Ref id=\"Server\" /></Arg>");
+                    out.println("            <Arg type=\"int\">1</Arg>     <!-- number of acceptors -->");
+                    out.println("            <Arg type=\"int\">0</Arg>     <!-- default number of selectors -->");
+                    out.println("            <Arg>");
+                    out.println("              <Array type=\"org.eclipse.jetty.server.ConnectionFactory\">    <!-- varargs so we need an array -->");
+                    out.println("                <Item>");
+                    out.println("                  <New class=\"org.eclipse.jetty.server.HttpConnectionFactory\">");
+                    out.println("                    <Arg>");
+                    out.println("                      <New class=\"org.eclipse.jetty.server.HttpConfiguration\">");
+                    out.println("                        <Set name=\"sendServerVersion\">false</Set>");
+                    out.println("                        <Set name=\"sendDateHeader\">true</Set>");
+                    out.println("                      </New>");
+                    out.println("                    </Arg>");
+                    out.println("                  </New>");
+                    out.println("                </Item>");
+                    out.println("              </Array>");
+                    out.println("            </Arg>");
+                    modified = true;
+                    continue;
+             // SSL starts here
+                } else if (s.contains("org.eclipse.jetty.http.ssl.SslContextFactory")) {
+                    s = s.replace("org.eclipse.jetty.http.ssl.SslContextFactory", "org.eclipse.jetty.util.ssl.SslContextFactory");
+                    out.println("  <!-- Modified by I2P migration script for Jetty 9. Do not remove this line -->");
+                    out.println(s);
+                    // don't try to migrate from below, just generate a new list
+                    out.println("    <Set name=\"ExcludeCipherSuites\">");
+                    out.println("      <Array type=\"java.lang.String\">");
+                    for (String ss : I2PSSLSocketFactory.EXCLUDE_CIPHERS) {
+                        out.println("        <Item>" + ss + "</Item>");
+                    }
+                    out.println("      </Array>");
+                    out.println("    </Set>");
+                    out.println("    <Set name=\"ExcludeProtocols\">");
+                    out.println("      <Array type=\"java.lang.String\">");
+                    for (String ss : I2PSSLSocketFactory.EXCLUDE_PROTOCOLS) {
+                        out.println("        <Item>" + ss + "</Item>");
+                    }
+                    out.println("      </Array>");
+                    out.println("    </Set>");
+                    modified = true;
+                    continue;
+                } else if (s.contains("org.eclipse.jetty.server.ssl.SslSelectChannelConnector")) {
+                    s = s.replace("org.eclipse.jetty.server.ssl.SslSelectChannelConnector", "org.eclipse.jetty.server.ServerConnector");
+                    out.println("      <!-- Modified by I2P migration script for Jetty 9. Do not remove this line -->");
+                    out.println(s);
+                    out.println("        <Arg><Ref id=\"Server\" /></Arg>");
+                    out.println("        <Arg type=\"int\">1</Arg>     <!-- number of acceptors -->");
+                    out.println("        <Arg type=\"int\">0</Arg>     <!-- default number of selectors -->");
+                    out.println("        <Arg>");
+                    out.println("           <Array type=\"org.eclipse.jetty.server.ConnectionFactory\">    <!-- varargs so we need an array -->");
+                    out.println("              <Item>");
+                    out.println("                <New class=\"org.eclipse.jetty.server.SslConnectionFactory\">");
+                    out.println("                  <Arg><Ref id=\"sslContextFactory\" /></Arg>");
+                    out.println("                  <Arg>http/1.1</Arg>");
+                    out.println("                </New>");
+                    out.println("              </Item>");
+                    out.println("              <Item>");
+                    out.println("                <New class=\"org.eclipse.jetty.server.HttpConnectionFactory\">");
+                    out.println("                  <Arg>");
+                    out.println("                    <New class=\"org.eclipse.jetty.server.HttpConfiguration\">");
+                    out.println("                      <Set name=\"sendServerVersion\">false</Set>");
+                    out.println("                      <Set name=\"sendDateHeader\">true</Set>");
+                    out.println("                    </New>");
+                    out.println("                  </Arg>");
+                    out.println("                </New>");
+                    out.println("              </Item>");
+                    out.println("            </Array>");
+                    out.println("        </Arg>");
+                    foundSSCC = true;
+                    modified = true;
+                    continue;
+                } else if (foundSSCC && s.contains("<Set name=\"ExcludeCipherSuites\">")) {
+                    // delete the old ExcludeCipherSuites in this section
+                    do {
+                        s = DataHelper.readLine(in);
+                    } while(s != null && !s.contains("</Set>"));
+                    modified = true;
+                    continue;
+                } else if (foundSSCC &&
+                           s.contains("<Ref id=\"sslContextFactory\"")) {
+                    // delete old one in this section, replaced above
+                    modified = true;
+                    continue;
+                } else if (s.contains("<Set name=\"KeyStore\">")) {
+                    s = s.replace("<Set name=\"KeyStore\">", "<Set name=\"KeyStorePath\">");
+                    modified = true;
+                } else if (s.contains("<Set name=\"TrustStore\">")) {
+                    s = s.replace("<Set name=\"TrustStore\">", "<Set name=\"TrustStorePath\">");
+                    modified = true;
+             // SSL ends here
+                } else if (s.contains("class=\"org.eclipse.jetty.deploy.providers.ContextProvider\">")) {
+                    // WebAppProvider now also does what ContextProvider used to do
+                    out.println("        <!-- Modified by I2P migration script for Jetty 9. Do not remove this line -->");
+                    s = s.replace("class=\"org.eclipse.jetty.deploy.providers.ContextProvider\">", "class=\"org.eclipse.jetty.deploy.providers.WebAppProvider\">");
+                    modified = true;
+                } else if (s.contains("<Set name=\"maxIdleTime\">")) {
+                    s = s.replace("<Set name=\"maxIdleTime\">", "<Set name=\"idleTimeout\">");
+                    modified = true;
+                } else if (s.contains("<Set name=\"gracefulShutdown\">")) {
+                    s = s.replace("<Set name=\"gracefulShutdown\">", "<Set name=\"stopTimeout\">");
+                    modified = true;
+                } else if (s.contains("org.eclipse.jetty.server.HttpConfiguration")) {
+                    foundHC = true;
+                } else if (!foundHC &&
+                           (s.contains("<Set name=\"sendServerVersion\">") ||
+                            s.contains("<Set name=\"sendDateHeader\">"))) {
+                    // old ones for Server, not in HTTPConfiguration section, delete
+                    modified = true;
+                    continue;
+                } else if (s.contains("<Set name=\"Acceptors\">") ||
+                           s.contains("<Set name=\"acceptors\">") ||
+                           s.contains("<Set name=\"statsOn\">") ||
+                           s.contains("<Set name=\"confidentialPort\">") ||
+                           s.contains("<Set name=\"lowResourcesConnections\">") ||
+                           s.contains("<Set name=\"lowResourcesMaxIdleTime\">") ||
+                           s.contains("<Set name=\"useDirectBuffers\">")) {
+                    // delete
+                    modified = true;
+                    continue;
+                }
+                out.println(s);
+            }
+        } catch (IOException ioe) {
+            if (in != null) {
+                System.err.println("FAILED migration of " + xmlFile + ": " + ioe);
+            }
+            return false;
+        } finally {
+            if (in != null) try { in.close(); } catch (IOException ioe) {}
+            if (out != null) out.close();
+        }
+        if (modified) {
+            return FileUtil.rename(newFile, xmlFile);
+        } else {
+            newFile.delete();
+            return true;
+        }
     }
 
-    /** do we have Jetty 7? */
+
+    /** do we have Jetty 7/8/9? */
     private static boolean hasLatestJetty() {
         if (!_wasChecked) {
             try {
@@ -164,9 +438,18 @@ abstract class MigrateJetty {
      *  @since Jetty 7
      */
     private static boolean backupFile(File from) {
+        return backupFile(from, BACKUP_SUFFIX);
+    }
+
+    /**
+     *  Backup a file with given suffix
+     *  @return success
+     *  @since Jetty 9
+     */
+    private static boolean backupFile(File from, String suffix) {
         if (!from.exists())
             return true;
-        File to = new File(from.getAbsolutePath() + BACKUP_SUFFIX);
+        File to = new File(from.getAbsolutePath() + suffix);
         if (to.exists())
             to = new File(to.getAbsolutePath() + "." + System.currentTimeMillis());
         boolean rv = WorkingDir.copyFile(from, to);
diff --git a/router/java/src/net/i2p/router/startup/RouterAppManager.java b/router/java/src/net/i2p/router/startup/RouterAppManager.java
index e94684d15..4449b5a6f 100644
--- a/router/java/src/net/i2p/router/startup/RouterAppManager.java
+++ b/router/java/src/net/i2p/router/startup/RouterAppManager.java
@@ -22,21 +22,19 @@ import net.i2p.util.Log;
  *
  *  @since 0.9.4
  */
-public class RouterAppManager implements ClientAppManager {
+public class RouterAppManager extends ClientAppManagerImpl {
     
     private final RouterContext _context;
     private final Log _log;
     // client to args
     // this assumes clients do not override equals()
     private final ConcurrentHashMap<ClientApp, String[]> _clients;
-    // registered name to client
-    private final ConcurrentHashMap<String, ClientApp> _registered;
 
     public RouterAppManager(RouterContext ctx) {
+        super(ctx);
         _context = ctx;
         _log = ctx.logManager().getLog(RouterAppManager.class);
         _clients = new ConcurrentHashMap<ClientApp, String[]>(16);
-        _registered = new ConcurrentHashMap<String, ClientApp>(8);
         ctx.addShutdownTask(new Shutdown());
     }
 
@@ -48,7 +46,7 @@ public class RouterAppManager implements ClientAppManager {
     public boolean addAndStart(ClientApp app, String[] args) {
         if (_log.shouldLog(Log.INFO))
             _log.info("Client " + app.getDisplayName() + " ADDED");
-        String[] old = _clients.put(app, args);
+        String[] old = _clients.putIfAbsent(app, args);
         if (old != null)
             throw new IllegalArgumentException("already added");
         try {
@@ -91,6 +89,7 @@ public class RouterAppManager implements ClientAppManager {
      *  @param message may be null
      *  @param e may be null
      */
+    @Override
     public void notify(ClientApp app, ClientAppState state, String message, Exception e) {
         switch(state) {
           case UNINITIALIZED:
@@ -137,6 +136,7 @@ public class RouterAppManager implements ClientAppManager {
      *  @param app non-null
      *  @return true if successful, false if duplicate name
      */
+    @Override
     public boolean register(ClientApp app) {
         if (!_clients.containsKey(app)) {
             // Allow registration even if we didn't start it,
@@ -148,32 +148,9 @@ public class RouterAppManager implements ClientAppManager {
         if (_log.shouldLog(Log.INFO))
             _log.info("Client " + app.getDisplayName() + " REGISTERED AS " + app.getName());
         // TODO if old app in there is not running and != this app, allow replacement
-        return _registered.putIfAbsent(app.getName(), app) == null;
+        return super.register(app);
     }
     
-    /**
-     *  Unregister with the manager. Name must be the same as that from register().
-     *  Only required for apps used by other apps.
-     *
-     *  @param app non-null
-     */
-    public void unregister(ClientApp app) {
-        _registered.remove(app.getName(), app);
-    }
-    
-    /**
-     *  Get a registered app.
-     *  Only used for apps finding other apps.
-     *  Do not hold a static reference.
-     *  If you only need to find a port, use the PortMapper instead.
-     *
-     *  @param name non-null
-     *  @return client app or null
-     */
-    public ClientApp getRegisteredApp(String name) {
-        return _registered.get(name);
-    }
-
     /// end ClientAppManager interface
 
     /**
diff --git a/router/java/src/net/i2p/router/startup/WorkingDir.java b/router/java/src/net/i2p/router/startup/WorkingDir.java
index 5c9b9192e..fc9ae45f8 100644
--- a/router/java/src/net/i2p/router/startup/WorkingDir.java
+++ b/router/java/src/net/i2p/router/startup/WorkingDir.java
@@ -73,6 +73,7 @@ public class WorkingDir {
 
         boolean isWindows = SystemVersion.isWindows();
         File dirf = null;
+        String gentooWarning = null;
         if (dir != null) {
             dirf = new SecureDirectory(dir);
         } else {
@@ -92,10 +93,46 @@ public class WorkingDir {
                     dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_MAC);
                 }
             } else {
-                if (SystemVersion.isLinuxService())
-                    dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_DAEMON);
-                else
+                if (SystemVersion.isLinuxService()) {
+                    if (SystemVersion.isGentoo() &&
+                        SystemVersion.GENTOO_USER.equals(System.getProperty("user.name"))) {
+                        // whoops, we didn't recognize Gentoo as a service until 0.9.29,
+                        // so the config dir was /var/lib/i2p/.i2p through 0.9.28
+                        // and changed to /var/lib/i2p/i2p-config in 0.9.29.
+                        // Look for both to decide which to use.
+                        // We prefer .i2p if neither exists.
+                        // We prefer the newer if both exist.
+                        File d1 = new SecureDirectory(home, WORKING_DIR_DEFAULT);
+                        File d2 = new SecureDirectory(home, WORKING_DIR_DEFAULT_DAEMON);
+                        boolean e1 = isSetup(d1);
+                        boolean e2 = isSetup(d2);
+                        if (e1 && e2) {
+                            // d1 is probably older. Switch if it isn't.
+                            if (d2.lastModified() < d1.lastModified()) {
+                                File tmp = d2;
+                                d2 = d1;
+                                d1 = tmp;
+                                // d1 now is the older one
+                            }
+                            dirf = d2;
+                            gentooWarning = "Warning - Found both an old configuration directory " + d1.getAbsolutePath() +
+                                            " and new configuration directory " + d2.getAbsolutePath() +
+                                            " created due to a bug in release 0.9.29\n. Using the new configuration" +
+                                            " directory. To use the old directory instead, stop i2p," +
+                                            " delete the new directory, and restart.";
+                        } else if (e1 && !e2) {
+                            dirf = d1;
+                        } else if (!e1 && e2) {
+                            dirf = d2;
+                        } else {
+                            dirf = d1;
+                        }
+                    } else {
+                        dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_DAEMON);
+                    }
+                } else {
                     dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT);
+                }
             }
         }
 
@@ -134,6 +171,9 @@ public class WorkingDir {
             if (dirf.isDirectory()) {
                 if (isSetup(dirf)) {
                     setupSystemOut(rv);
+                    // see above for why
+                    if (gentooWarning != null)
+                        System.err.println(gentooWarning);
                     return rv; // all is good, we found the user directory
                 }
             }
@@ -327,7 +367,6 @@ public class WorkingDir {
         } catch (IOException ioe) {
             if (in != null) {
                 System.err.println("FAILED copy " + oldFile + ": " + ioe);
-                return false;
             }
             return false;
         } finally {
@@ -365,7 +404,6 @@ public class WorkingDir {
         } catch (IOException ioe) {
             if (in != null) {
                 System.err.println("FAILED copy " + oldFile + ": " + ioe);
-                return false;
             }
             return false;
         } finally {
diff --git a/router/java/src/net/i2p/router/tasks/OOMListener.java b/router/java/src/net/i2p/router/tasks/OOMListener.java
index ed2050a39..9631d81a0 100644
--- a/router/java/src/net/i2p/router/tasks/OOMListener.java
+++ b/router/java/src/net/i2p/router/tasks/OOMListener.java
@@ -53,7 +53,10 @@ public class OOMListener implements I2PThread.OOMEventListener {
             // you the actual config file path, have to guess
             String path;
             if (SystemVersion.isLinuxService()) {
-                path = "/etc/i2p";
+                if (SystemVersion.isGentoo())
+                    path = "/usr/share/i2p";
+                else
+                    path = "/etc/i2p";
             } else {
                 path = _context.getBaseDir().toString();
             }
diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java
index df9f33adf..f132f47b7 100644
--- a/router/java/src/net/i2p/router/transport/TransportImpl.java
+++ b/router/java/src/net/i2p/router/transport/TransportImpl.java
@@ -815,18 +815,18 @@ public abstract class TransportImpl implements Transport {
     /**
      *  This returns true if the force-firewalled setting is configured, false otherwise.
      *
-     *  @since 0.9.20
+     *  @since 0.9.20, public since 0.9.30
      */
-    protected boolean isIPv4Firewalled() {
+    public boolean isIPv4Firewalled() {
         return TransportUtil.isIPv4Firewalled(_context, getStyle());
     }
 
     /**
      *  This returns true if the force-firewalled setting is configured, false otherwise.
      *
-     *  @since 0.9.27
+     *  @since 0.9.27, public since 0.9.30
      */
-    protected boolean isIPv6Firewalled() {
+    public boolean isIPv6Firewalled() {
         return TransportUtil.isIPv6Firewalled(_context, getStyle());
     }
 
@@ -987,9 +987,9 @@ public abstract class TransportImpl implements Transport {
     }
 
     /**
-     *  @since IPv6
+     *  @since IPv6, public since 0.9.30
      */
-    protected TransportUtil.IPv6Config getIPv6Config() {
+    public TransportUtil.IPv6Config getIPv6Config() {
         return TransportUtil.getIPv6Config(_context, getStyle());
     }
 
diff --git a/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java b/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java
index a35fd7c3d..151c0301f 100644
--- a/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java
+++ b/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java
@@ -170,7 +170,7 @@ class IntroductionManager {
      * @return number of introducers added
      */
     public int pickInbound(Properties ssuOptions, int howMany) {
-        int start = _context.random().nextInt(Integer.MAX_VALUE);
+        int start = _context.random().nextInt();
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("Picking inbound out of " + _inbound.size());
         if (_inbound.isEmpty()) return 0;
diff --git a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java
index 6c49e78ea..efa408187 100644
--- a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java
+++ b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java
@@ -1215,17 +1215,20 @@ class PacketBuilder {
         UDPAddress addr = state.getRemoteAddress();
         int count = addr.getIntroducerCount();
         List<UDPPacket> rv = new ArrayList<UDPPacket>(count);
+        long cutoff = _context.clock().now() + 5*60*1000L;
         for (int i = 0; i < count; i++) {
             InetAddress iaddr = addr.getIntroducerHost(i);
             int iport = addr.getIntroducerPort(i);
             byte ikey[] = addr.getIntroducerKey(i);
             long tag = addr.getIntroducerTag(i);
+            long exp = addr.getIntroducerExpiration(i);
             // let's not use an introducer on a privileged port, sounds like trouble
             if (ikey == null || !TransportUtil.isValidPort(iport) ||
                 iaddr == null || tag <= 0 ||
                 // must be IPv4 for now as we don't send Alice IP/port, see below
                 iaddr.getAddress().length != 4 ||
                 (!_transport.isValid(iaddr.getAddress())) ||
+                (exp > 0 && exp < cutoff) ||
                 (Arrays.equals(iaddr.getAddress(), _transport.getExternalIP()) && !_transport.allowLocal())) {
                 if (_log.shouldLog(Log.WARN))
                     _log.warn("Cannot build a relay request to " + state.getRemoteIdentity().calculateHash()
diff --git a/router/java/src/net/i2p/router/transport/udp/PeerTestEvent.java b/router/java/src/net/i2p/router/transport/udp/PeerTestEvent.java
new file mode 100644
index 000000000..e6d0c402a
--- /dev/null
+++ b/router/java/src/net/i2p/router/transport/udp/PeerTestEvent.java
@@ -0,0 +1,146 @@
+package net.i2p.router.transport.udp;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
+import net.i2p.util.SimpleTimer2;
+
+import static net.i2p.router.transport.TransportUtil.IPv6Config.*;
+import static net.i2p.router.transport.udp.PeerTestState.Role.*;
+    
+/**
+ *  Initiate a test (we are Alice)
+ *
+ *  @since 0.9.30 moved out of UDPTransport
+ */
+class PeerTestEvent extends SimpleTimer2.TimedEvent {
+    private final RouterContext _context;
+    private final Log _log;
+    private final UDPTransport  _transport;
+    private final PeerTestManager  _testManager;
+
+    private boolean _alive;
+    /** when did we last test our reachability */
+    private final AtomicLong _lastTested = new AtomicLong();
+    private final AtomicLong _lastTestedV6 = new AtomicLong();
+    private static final int NO_FORCE = 0, FORCE_IPV4 = 1, FORCE_IPV6 = 2;
+    private int _forceRun;
+
+    private static final int TEST_FREQUENCY = 13*60*1000;
+    private static final int MIN_TEST_FREQUENCY = 45*1000;
+
+    PeerTestEvent(RouterContext ctx, UDPTransport udp, PeerTestManager ptmgr) {
+        super(ctx.simpleTimer2());
+        _context = ctx;
+        _log = ctx.logManager().getLog(PeerTestEvent.class);
+        _transport = udp;
+        _testManager = ptmgr;
+    }
+        
+    public synchronized void timeReached() {
+        // just for IPv6 for now
+        if (shouldTest()) {
+            long now = _context.clock().now();
+            long sinceRunV4 = now - _lastTested.get();
+            long sinceRunV6 = now - _lastTestedV6.get();
+            if (_forceRun == FORCE_IPV4 && sinceRunV4 >= MIN_TEST_FREQUENCY) {
+                locked_runTest(false);
+            } else if (_transport.hasIPv6Address() &&_forceRun == FORCE_IPV6 && sinceRunV6 >= MIN_TEST_FREQUENCY) {
+                locked_runTest(true);
+            } else if (sinceRunV4 >= TEST_FREQUENCY && _transport.getIPv6Config() != IPV6_ONLY) {
+                locked_runTest(false);
+            } else if (_transport.hasIPv6Address() && sinceRunV6 >= TEST_FREQUENCY) {
+                locked_runTest(true);
+            } else {
+                if (_log.shouldLog(Log.INFO))
+                    _log.info("PTE timeReached(), no test run, last v4 test: " + new java.util.Date(_lastTested.get()) +
+                              " last v6 test: " + new java.util.Date(_lastTestedV6.get()));
+            }
+        }
+        if (_alive) {
+            long delay = (TEST_FREQUENCY / 2) + _context.random().nextInt(TEST_FREQUENCY);
+            // if we have 2 addresses, give IPv6 a chance also
+            if (_transport.hasIPv6Address() && _transport.getIPv6Config() != IPV6_ONLY)
+                delay /= 2;
+            schedule(delay);
+        }
+    }
+        
+    private void locked_runTest(boolean isIPv6) {
+        PeerState bob = _transport.pickTestPeer(BOB, isIPv6, null);
+        if (bob != null) {
+            if (_log.shouldLog(Log.INFO))
+                _log.info("Running periodic test with bob = " + bob);
+            _testManager.runTest(bob.getRemoteIPAddress(), bob.getRemotePort(), bob.getCurrentCipherKey(), bob.getCurrentMACKey());
+            setLastTested(isIPv6);
+        } else {
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Unable to run peer test, no peers available - v6? " + isIPv6);
+        }
+        _forceRun = NO_FORCE;
+    }
+        
+    /**
+     *  Run within the next 45 seconds at the latest
+     *  @since 0.9.13
+     */
+    public synchronized void forceRunSoon(boolean isIPv6) {
+        if (!isIPv6 && _transport.isIPv4Firewalled())
+            return;
+        if (isIPv6 && _transport.isIPv6Firewalled())
+            return;
+        _forceRun = isIPv6 ? FORCE_IPV6 : FORCE_IPV4;
+        reschedule(MIN_TEST_FREQUENCY);
+    }
+        
+    /**
+     *
+     *  Run within the next 5 seconds at the latest
+     *  @since 0.9.13
+     */
+    public synchronized void forceRunImmediately(boolean isIPv6) {
+        if (!isIPv6 && _transport.isIPv4Firewalled())
+            return;
+        if (isIPv6 && _transport.isIPv6Firewalled())
+            return;
+        if (isIPv6)
+            _lastTestedV6.set(0);
+        else
+            _lastTested.set(0);
+        _forceRun = isIPv6 ? FORCE_IPV6 : FORCE_IPV4;
+        reschedule(5*1000);
+    }
+        
+    public synchronized void setIsAlive(boolean isAlive) {
+        _alive = isAlive;
+        if (isAlive) {
+            long delay = _context.random().nextInt(2*TEST_FREQUENCY);
+            reschedule(delay);
+        } else {
+            cancel();
+        }
+    }
+
+    /**
+     *  Set the last-tested timer to now
+     *  @since 0.9.13
+     */
+    public void setLastTested(boolean isIPv6) {
+        // do not synchronize - deadlock with PeerTestManager
+        long now = _context.clock().now();
+        if (isIPv6)
+            _lastTestedV6.set(now);
+        else
+            _lastTested.set(now);
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("PTE.setLastTested() - v6? " + isIPv6, new Exception());
+    }
+    
+    private boolean shouldTest() {
+        return ! (_context.router().isHidden() ||
+                  (_transport.isIPv4Firewalled() && _transport.isIPv6Firewalled()));
+        //String val = _context.getProperty(PROP_SHOULD_TEST);
+        //return ( (val != null) && ("true".equals(val)) );
+    }
+}
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
index 383c5e37d..c5681372a 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -75,12 +75,14 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
     private volatile PacketPusher _pusher;
     private final InboundMessageFragments _inboundFragments;
     //private UDPFlooder _flooder;
-    private PeerTestManager _testManager;
+    private final PeerTestManager _testManager;
     private final IntroductionManager _introManager;
     private final ExpirePeerEvent _expireEvent;
     private final PeerTestEvent _testEvent;
     private final PacketBuilder _destroyBuilder;
     private Status _reachabilityStatus;
+    private Status _reachabilityStatusPending;
+    // only for logging, to be removed
     private long _reachabilityStatusLastUpdated;
     private int _reachabilityStatusUnchanged;
     private long _introducersSelectedOn;
@@ -195,14 +197,13 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
     private static final int MAX_CONSECUTIVE_FAILED = 5;
     
     public static final int DEFAULT_COST = 5;
-    private static final int TEST_FREQUENCY = 13*60*1000;
-    private static final int MIN_TEST_FREQUENCY = 45*1000;
     static final long[] RATES = { 10*60*1000 };
     /** minimum active peers to maintain IP detection, etc. */
     private static final int MIN_PEERS = 5;
     private static final int MIN_PEERS_IF_HAVE_V6 = 30;
     /** minimum peers volunteering to be introducers if we need that */
     private static final int MIN_INTRODUCER_POOL = 5;
+    private static final long INTRODUCER_EXPIRATION_MARGIN = 20*60*1000L;
     
     private static final int[] BID_VALUES = { 15, 20, 50, 65, 80, 95, 100, 115, TransportBid.TRANSIENT_FAIL };
     private static final int FAST_PREFERRED_BID = 0;
@@ -265,8 +266,10 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         //    _flooder = new UDPFlooder(_context, this);
         _expireTimeout = EXPIRE_TIMEOUT;
         _expireEvent = new ExpirePeerEvent();
-        _testEvent = new PeerTestEvent();
+        _testManager = new PeerTestManager(_context, this);
+        _testEvent = new PeerTestEvent(_context, this, _testManager);
         _reachabilityStatus = Status.UNKNOWN;
+        _reachabilityStatusPending = Status.OK;
         _introManager = new IntroductionManager(_context, this);
         _introducersSelectedOn = -1;
         _lastInboundReceivedOn = -1;
@@ -475,9 +478,6 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         if (_establisher == null)
             _establisher = new EstablishmentManager(_context, this);
         
-        if (_testManager == null)
-            _testManager = new PeerTestManager(_context, this);
-        
         if (_handler == null)
             _handler = new PacketHandler(_context, this, _establisher, _inboundFragments, _testManager, _introManager);
         
@@ -666,6 +666,14 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         return null;
     }
 
+    /**
+     *  For PeerTestManager
+     *  @since 0.9.30
+     */
+    boolean hasIPv6Address() {
+        return _haveIPv6Address;
+    }
+
     /**
      *  Is this IP too close to ours to trust it for
      *  things like relaying?
@@ -1340,8 +1348,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
                 status != Status.IPV4_DISABLED_IPV6_FIREWALLED &&
                 status != Status.DISCONNECTED &&
                 _reachabilityStatusUnchanged < 7) {
-                // IPv4 only for now
-                _testEvent.forceRunSoon(false);
+                _testEvent.forceRunSoon(peer.isIPv6());
             }
         }
         return true;
@@ -1558,17 +1565,21 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         RouterAddress addr = getCurrentAddress(false);
         if (introducersRequired()) {
             UDPAddress ua = new UDPAddress(addr);
+            long now = _context.clock().now();
             int valid = 0;
             for (int i = 0; i < ua.getIntroducerCount(); i++) {
                 // warning: this is only valid as long as we use the ident hash as their key.
                 byte[] key = ua.getIntroducerKey(i);
                 if (key.length != Hash.HASH_LENGTH)
                     continue;
+                long exp = ua.getIntroducerExpiration(i);
+                if (exp > 0 && exp < now + INTRODUCER_EXPIRATION_MARGIN)
+                    continue;
                 PeerState peer = getPeerState(new Hash(key));
                 if (peer != null)
                     valid++;
             }
-            long sinceSelected = _context.clock().now() - _introducersSelectedOn;
+            long sinceSelected = now - _introducersSelectedOn;
             if (valid >= PUBLIC_RELAY_COUNT) {
                 // try to shift 'em around every 10 minutes or so
                 if (sinceSelected > 17*60*1000) {
@@ -3146,6 +3157,27 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
             }
 
             if (status != old) {
+                // for the following transitions ONLY, require two in a row
+                // to prevent thrashing
+                if ((old == Status.OK && (status == Status.DIFFERENT ||
+                                          status == Status.REJECT_UNSOLICITED ||
+                                          status == Status.IPV4_FIREWALLED_IPV6_OK ||
+                                          status == Status.IPV4_SNAT_IPV6_OK ||
+                                          status == Status.IPV4_OK_IPV6_FIREWALLED)) ||
+                    (status == Status.OK && (old == Status.DIFFERENT ||
+                                             old == Status.REJECT_UNSOLICITED ||
+                                             old == Status.IPV4_FIREWALLED_IPV6_OK ||
+                                             old == Status.IPV4_SNAT_IPV6_OK ||
+                                             old == Status.IPV4_OK_IPV6_FIREWALLED))) {
+                    if (status != _reachabilityStatusPending) {
+                        if (_log.shouldLog(Log.WARN))
+                            _log.warn("Old status: " + old + " status pending confirmation: " + status +
+                                      " Caused by update: " + newStatus);
+                        _reachabilityStatusPending = status;
+                        _testEvent.forceRunSoon(isIPv6);
+                        return;
+                    }
+                }
                 _reachabilityStatusUnchanged = 0;
                 long now = _context.clock().now();
                 _reachabilityStatusLastUpdated = now;
@@ -3153,6 +3185,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
             } else {
                 _reachabilityStatusUnchanged++;
             }
+            _reachabilityStatusPending = status;
         }
         if (status != old) {
             if (_log.shouldLog(Log.WARN))
@@ -3278,129 +3311,6 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         return null;
     }
     
-    private boolean shouldTest() {
-        return ! (_context.router().isHidden() ||
-                  (isIPv4Firewalled() && isIPv6Firewalled()));
-        //String val = _context.getProperty(PROP_SHOULD_TEST);
-        //return ( (val != null) && ("true".equals(val)) );
-    }
-    
-    /**
-     *  Initiate a test (we are Alice)
-     */
-    private class PeerTestEvent extends SimpleTimer2.TimedEvent {
-        private boolean _alive;
-        /** when did we last test our reachability */
-        private final AtomicLong _lastTested = new AtomicLong();
-        private final AtomicLong _lastTestedV6 = new AtomicLong();
-        private static final int NO_FORCE = 0, FORCE_IPV4 = 1, FORCE_IPV6 = 2;
-        private int _forceRun;
-
-        PeerTestEvent() {
-            super(_context.simpleTimer2());
-        }
-        
-        public synchronized void timeReached() {
-            // just for IPv6 for now
-            if (shouldTest()) {
-                long now = _context.clock().now();
-                long sinceRunV4 = now - _lastTested.get();
-                long sinceRunV6 = now - _lastTestedV6.get();
-                if (_forceRun == FORCE_IPV4 && sinceRunV4 >= MIN_TEST_FREQUENCY) {
-                    locked_runTest(false);
-                } else if (_haveIPv6Address &&_forceRun == FORCE_IPV6 && sinceRunV6 >= MIN_TEST_FREQUENCY) {
-                    locked_runTest(true);
-                } else if (sinceRunV4 >= TEST_FREQUENCY && getIPv6Config() != IPV6_ONLY) {
-                    locked_runTest(false);
-                } else if (_haveIPv6Address && sinceRunV6 >= TEST_FREQUENCY) {
-                    locked_runTest(true);
-                } else {
-                    if (_log.shouldLog(Log.INFO))
-                        _log.info("PTE timeReached(), no test run, last v4 test: " + new java.util.Date(_lastTested.get()) +
-                                  " last v6 test: " + new java.util.Date(_lastTestedV6.get()));
-                }
-            }
-            if (_alive) {
-                long delay = (TEST_FREQUENCY / 2) + _context.random().nextInt(TEST_FREQUENCY);
-                // if we have 2 addresses, give IPv6 a chance also
-                if (_haveIPv6Address && getIPv6Config() != IPV6_ONLY)
-                    delay /= 2;
-                schedule(delay);
-            }
-        }
-        
-        private void locked_runTest(boolean isIPv6) {
-            PeerState bob = pickTestPeer(BOB, isIPv6, null);
-            if (bob != null) {
-                if (_log.shouldLog(Log.INFO))
-                    _log.info("Running periodic test with bob = " + bob);
-                _testManager.runTest(bob.getRemoteIPAddress(), bob.getRemotePort(), bob.getCurrentCipherKey(), bob.getCurrentMACKey());
-                setLastTested(isIPv6);
-            } else {
-                if (_log.shouldLog(Log.WARN))
-                    _log.warn("Unable to run peer test, no peers available - v6? " + isIPv6);
-            }
-            _forceRun = NO_FORCE;
-        }
-        
-        /**
-         *  Run within the next 45 seconds at the latest
-         *  @since 0.9.13
-         */
-        public synchronized void forceRunSoon(boolean isIPv6) {
-            if (!isIPv6 && isIPv4Firewalled())
-                return;
-            if (isIPv6 && isIPv6Firewalled())
-                return;
-            _forceRun = isIPv6 ? FORCE_IPV6 : FORCE_IPV4;
-            reschedule(MIN_TEST_FREQUENCY);
-        }
-        
-        /**
-         *
-         *  Run within the next 5 seconds at the latest
-         *  @since 0.9.13
-         */
-        public synchronized void forceRunImmediately(boolean isIPv6) {
-            if (!isIPv6 && isIPv4Firewalled())
-                return;
-            if (isIPv6 && isIPv6Firewalled())
-                return;
-            if (isIPv6)
-                _lastTestedV6.set(0);
-            else
-                _lastTested.set(0);
-            _forceRun = isIPv6 ? FORCE_IPV6 : FORCE_IPV4;
-            reschedule(5*1000);
-        }
-        
-        public synchronized void setIsAlive(boolean isAlive) {
-            _alive = isAlive;
-            if (isAlive) {
-                long delay = _context.random().nextInt(2*TEST_FREQUENCY);
-                reschedule(delay);
-            } else {
-                cancel();
-            }
-        }
-
-        /**
-         *  Set the last-tested timer to now
-         *  @since 0.9.13
-         */
-        public void setLastTested(boolean isIPv6) {
-            // do not synchronize - deadlock with PeerTestManager
-            long now = _context.clock().now();
-            if (isIPv6)
-                _lastTestedV6.set(now);
-            else
-                _lastTested.set(now);
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug("PTE.setLastTested() - v6? " + isIPv6, new Exception());
-        }
-        
-    }
-    
     /**
      *  Periodically ping the introducers, split out since we need to
      *  do it faster than we rebuild our address.
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
index fe2b57854..8299d892a 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
@@ -439,7 +439,7 @@ public class TunnelPoolManager implements TunnelManagerFacade {
 
     /**
      *  Add another destination to the same tunnels.
-     *  Must have same encryption key an a different signing key.
+     *  Must have same encryption key and a different signing key.
      *  @throws IllegalArgumentException if not
      *  @return success
      *  @since 0.9.21