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 f16cee6085..8841073f5f 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
@@ -630,8 +630,9 @@ public class RouterConsoleRunner implements RouterApp {
                 }
             }
             if (error) {
+                String port = (_listenPort != null) ? _listenPort : ((_sslListenPort != null) ? _sslListenPort : "7657");
                 System.err.println("WARNING: Error starting one or more listeners of the Router Console server.\n" +
-                               "If your console is still accessible at http://127.0.0.1:" + _listenPort + "/,\n" +
+                               "If your console is still accessible at http://127.0.0.1:" + port + "/,\n" +
                                "this may be a problem only with binding to the IPV6 address ::1.\n" +
                                "If so, you may ignore this error, or remove the\n" +
                                "\"::1,\" in the \"clientApp.0.args\" line of the clients.config file.");
diff --git a/history.txt b/history.txt
index d8ac9f1875..f7a45da3a3 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,31 @@
+2015-11-22 zzz
+Prop from i2p.i2p.zzz.test2:
+ * Build:
+   - More release checks
+   - Add systray dependency tracking to build
+   - Remove commons-logging classes from commons-logging.jar (ticket #1679)
+ * Lint:
+   - Replace URL with URI where possible
+   - Don't use DataHelper.fromLong() for 1-byte reads, for efficiency
+   - Don't catch Exception, catch RuntimeException or checked exception.
+ * i2psnark:
+   - Minor details page reformatting
+   - Add skipped length on details page
+ * NewsManager: Make it a ClientApp, not a RouterApp
+ * Profiles: Don't allow creation of our own profile
+ * Router: Revert JobTiming being a clock shift listener, not needed
+ * SSU:
+   - Support extended options
+   - Add support for requesting a relay tag via
+     Session Request extended options (ticket #1465)
+ * Tunnels:
+   - Locking fixes
+   - Don't set stats in our own profile
+   - Minor optimizations
+ * Utils:
+   - Centralize time zone code in DataHelper
+   - Add caching string split()
+
 2015-11-21 zzz
   * Console: Fix escaping of plugin description on /configclients (ticket #1711)
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 87e5bffca0..282c18b422 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 = 2;
 
     /** for example "-test" */
     public final static String EXTRA = "";