diff --git a/history.txt b/history.txt
index f539d9397..a1927b350 100644
--- a/history.txt
+++ b/history.txt
@@ -1,6 +1,11 @@
 2014-07-15 str4d
  * I2CP: Stubs for I2CP connections over Unix domain sockets
 
+2014-07-11 zzz
+ * Datagrams:
+  - Redefine the repliable datagram signature for non-DSA_SHA1 sig types;
+    was the sig of the SHA-256 of the payload, now the sig of the payload itself.
+
 2014-07-03 zzz
  * Base64:
   - Catch numerous decoding errors that were previously misdecoded (ticket #1318)
diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java
index c982671b7..9a8850c9b 100644
--- a/router/java/src/net/i2p/router/client/ClientManager.java
+++ b/router/java/src/net/i2p/router/client/ClientManager.java
@@ -48,7 +48,7 @@ import net.i2p.util.SystemVersion;
  */
 class ClientManager {
     private final Log _log;
-    protected List<ClientListenerRunner> _listeners;
+    protected final List<ClientListenerRunner> _listeners;
     // Destination --> ClientConnectionRunner
     // Locked for adds/removes but not lookups
     private final Map<Destination, ClientConnectionRunner>  _runners;
diff --git a/router/java/test/junit/net/i2p/router/client/LocalClientManager.java b/router/java/test/junit/net/i2p/router/client/LocalClientManager.java
index fb7bf15fc..f8df02989 100644
--- a/router/java/test/junit/net/i2p/router/client/LocalClientManager.java
+++ b/router/java/test/junit/net/i2p/router/client/LocalClientManager.java
@@ -36,9 +36,10 @@ class LocalClientManager extends ClientManager {
 
     @Override
     protected void startListeners() {
-        _listener = new LocalClientListenerRunner(_ctx, this, _port);
-        Thread t = new I2PThread(_listener, "ClientListener:" + _port, true);
+        ClientListenerRunner listener = new LocalClientListenerRunner(_ctx, this, _port);
+        Thread t = new I2PThread(listener, "ClientListener:" + _port, true);
         t.start();
+        _listeners.add(listener);
         _isStarted = true;
     }