diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java
index 8af6de367..7bffd2435 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java
@@ -294,6 +294,10 @@ class ConnectionHandler {
     private static class PoisonPacket extends Packet {
         public static final int POISON_MAX_DELAY_REQUEST = Packet.MAX_DELAY_REQUEST + 1;
 
+        public PoisonPacket() {
+            super(null);
+        }
+
         @Override
         public int getOptionalDelay() { return POISON_MAX_DELAY_REQUEST; }
 
diff --git a/history.txt b/history.txt
index f7a45da3a..b95b9b719 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,26 @@
+2015-11-27 zzz
+Prop from i2p.i2p.zzz.sam:
+ * PasswordManager: new methods for use by SAM
+ * SAM:
+   - Use getopt for SAM args processing
+   - Change default host from 0.0.0.0 to 127.0.0.1
+   - Add SSL support with -s option
+   - Add -c configfile option, default sam.config
+   - Add protocol and port notification
+   - Add authorization options in HELLO
+   - Add AUTH commands: ENABLE, DISABLE, ADD, REMOVE
+   - Add PING, PONG, QUIT, STOP, EXIT commands
+   - Add SSL option for STREAM FORWARD
+   - Move DatagramServer from SAMv3Handler to its own file
+   - Make DatagramServer a Handler, register with bridge
+   - Use ReadLine with timeout for SAMHandlerFactory
+   - Support parallel STREAM ACCEPTs
+   - Add HEADER option for RAW forwarding
+   - Better exception handling
+   - Extensive enhancements to Java client for testing
+   - Bump version to 3.2
+ * Streaming: Fix recognition of PoisonPacket in ConnectionHandler
+
 2015-11-22 zzz
 Prop from i2p.i2p.zzz.test2:
  * Build:
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 282c18b42..0725033fa 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 = 2;
+    public final static long BUILD = 3;
 
     /** for example "-test" */
     public final static String EXTRA = "";