diff --git a/history.txt b/history.txt
index 921111966..ff9792efe 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,24 @@
+2015-04-17 zzz
+Prop from i2p.i2p.zzz.test2:
+ * Console: Set session cookies to HttpOnly
+ * i2psnark: Remove extra mime types in i2psnark web.xml;
+   added to Jetty's default by now, or in our mime.properties file
+ * i2ptunnel:
+   - Send HTTP server port 443 traffic to the server
+     transparently, to support HTTPS over the same tunnel, if so configured
+   - Add check for total header size in HTTP server
+   - Return specific error pages to client on errors
+     in HTTP header processing in the HTTP server (ticket #1507)
+ * Jetty:
+   -  Add extensive help to jetty-ssl.xml
+   -  Set session cookies to HttpOnly in all webapps
+ * JobQueue: Make number of runners configurable
+ * Router: Move update extraction code to new class in tasks/
+ * Tunnels:
+   - Add bloom filter warning if high bandwidth but low memory
+   - Add new Bloom filter size, increase bandwidth limit (ticket #1505)
+   - Add config to disable Bloom filter for testing
+
 2015-04-16 zzz
  * I2CP: Run DistributeLocal jobs inline (ticket #1506)
  * i2psnark: Increase max tunnels to 10
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f6e6df3a5..4e28a2c8d 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 = 4;
+    public final static long BUILD = 5;
 
     /** for example "-test" */
     public final static String EXTRA = "";