diff --git a/history.txt b/history.txt
index d65405e6e..8594af438 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,18 @@
+2014-05-07 zzz
+ * Console:
+   - Add hiddengate.i2p
+   - Fix console getting disabled when saving client config (ticket #1260)
+ * Router: Add warning at startup if console is disabled
+ * SSU: Extend establishment phase retx timeout
+ * SusiMail:
+   - Don't fetch headers from folder sorters
+   - Update debug setting when saving config
+ * Transports: Use constant time method for HMAC verification
+ * Tunnels: Revert expl. OB default back to 2 + 0-1 for now
+
+2014-05-01 zzz
+ * SusiMail: js enhancements, build cleanups, css tweaks
+
 2014-04-30 zzz
  * Plugins: Retry deletion at restart if it fails (ticket #1257)
 
@@ -14,7 +29,8 @@
 
 2014-04-27 zzz
  * NTCP: Remove published NTCP address if SSU becomes firewalled,
-         to fix the "Firewalled with NTCP enabled" message
+         to fix the "Firewalled with NTCP enabled" message,
+         broken during IPv6 implementation in 0.9.8
  * Router: Set killVMOnEnd before runRouter() (for azi2phelper)
  * RoutingKeyGenerator: Don't assume UTC (for azi2phelper)
  * SusiMail:
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 31c35f8c3..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 = 14;
+    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 f01a69476..f86b8f959 100644
--- a/router/java/src/net/i2p/router/TunnelPoolSettings.java
+++ b/router/java/src/net/i2p/router/TunnelPoolSettings.java
@@ -69,9 +69,11 @@ public class TunnelPoolSettings {
     private static final int    DEFAULT_LENGTH_VARIANCE = 0;
     /** expl only */
     private static final int    DEFAULT_IB_EXPL_LENGTH = 2;
-    private static final int    DEFAULT_OB_EXPL_LENGTH = isSlow ? 2 : 3;
+    //private static final int    DEFAULT_OB_EXPL_LENGTH = isSlow ? 2 : 3;
+    private static final int    DEFAULT_OB_EXPL_LENGTH = 2;
     private static final int    DEFAULT_IB_EXPL_LENGTH_VARIANCE = isSlow ? 0 : 1;
-    private static final int    DEFAULT_OB_EXPL_LENGTH_VARIANCE = 0;
+    //private static final int    DEFAULT_OB_EXPL_LENGTH_VARIANCE = 0;
+    private static final int    DEFAULT_OB_EXPL_LENGTH_VARIANCE = isSlow ? 0 : 1;
 
     public static final boolean DEFAULT_ALLOW_ZERO_HOP = true;
     public static final int     DEFAULT_IP_RESTRICTION = 2;    // class B (/16)