diff --git a/history.txt b/history.txt
index 24a130874..4205f2a26 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,18 @@
+2015-02-06 zzz
+ * NetDB: Reduce max job lag for floodfill
+ * Transport:
+   - Decrease DH refiller initial delay and increase buffer size
+     to reduce chance of running out on high-bandwidth routers
+   - Add event log for reachability change
+
+2015-02-01 zzz
+ * Crypto: Catch IAE in generateCertificate()
+ * NetDB: Don't flood an RI back to itself. While Java ffs self-flood,
+   other implementations may not.
+ * OCMOSJ: Pick a OB tunnel at random, not with the OBEP closest
+   to the lease, as that may be hurting connection reliability.
+ * Router: Call warmupCrypto() earlier in the initialization
+
 2015-01-31 zzz
  * Console:
    - Don't display invalid IPv6 addresses as options on /confignet
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f5c926454..43dca9240 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 = 20;
+    public final static long BUILD = 21;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java
index f38aa5e9d..fa0af6d78 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java
@@ -149,8 +149,9 @@ class FloodfillMonitorJob extends JobImpl {
             ffcount++;
         int good = ffcount - failcount;
         boolean happy = getContext().router().getRouterInfo().getCapabilities().indexOf("R") >= 0;
-        // Use the same job lag test as in RouterThrottleImpl
-        happy = happy && getContext().jobQueue().getMaxLag() < 2*1000;
+        // TODO - limit may still be too high
+        // TODO - use jobQueue.jobLag stat instead?
+        happy = happy && getContext().jobQueue().getMaxLag() < 100;
         // Only if we're pretty well integrated...
         happy = happy && _facade.getKnownRouters() >= 200;
         happy = happy && getContext().commSystem().countActivePeers() >= 50;