diff --git a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
index 11f9551fa..5f5a2c900 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
@@ -104,9 +104,9 @@ public class I2PSnarkUtil {
             if (opts.getProperty("outbound.nickname") == null)
                 opts.setProperty("outbound.nickname", "I2PSnark");
             if (opts.getProperty("i2p.streaming.inactivityTimeout") == null)
-                opts.setProperty("i2p.streaming.inactivityTimeout", "90000");
+                opts.setProperty("i2p.streaming.inactivityTimeout", "240000");
             if (opts.getProperty("i2p.streaming.inactivityAction") == null)
-                opts.setProperty("i2p.streaming.inactivityAction", "2"); // 1 == disconnect, 2 == ping
+                opts.setProperty("i2p.streaming.inactivityAction", "1"); // 1 == disconnect, 2 == ping
             if (opts.getProperty("i2p.streaming.initialWindowSize") == null)
                 opts.setProperty("i2p.streaming.initialWindowSize", "1");
             if (opts.getProperty("i2p.streaming.slowStartGrowthRateFactor") == null)
diff --git a/history.txt b/history.txt
index 43e285150..71294ca61 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,10 @@
-$Id: history.txt,v 1.595 2007-10-11 01:03:22 zzz Exp $
+$Id: history.txt,v 1.596 2007-11-06 06:26:01 jrandom Exp $
+
+2007-11-24 zzz
+    * i2psnark: increase streaming lib write timeout to 240 sec and change
+      timeout action from "ping" to "disconect", as the fix in .30 to
+      honor options on outbound connections led to hung outbound connections
+      (bitfield never transmitted, connection never dropped)
 
 2007-11-06 jrandom
     * add i2phost.i2p to the jump list
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 5c85e4008..2c914ed01 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.530 $ $Date: 2007-10-07 23:11:37 $";
+    public final static String ID = "$Revision: 1.531 $ $Date: 2007-10-11 01:03:21 $";
     public final static String VERSION = "0.6.1.30";
-    public final static long BUILD = 2;
+    public final static long BUILD = 3;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);