diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
index 203b828d8..8bf0b6a6c 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
@@ -56,7 +56,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
         }
     }
 
-    protected static final int DEFAULT_READ_TIMEOUT = 60*1000;
+    protected static final int DEFAULT_READ_TIMEOUT = 5*60*1000;
     
     protected static long __requestId = 0;
 
diff --git a/history.txt b/history.txt
index 19bf8e7aa..cd939af9c 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,9 @@
+2012-01-20 sponge
+  * Fix too short of delay for http. It is up to the browser to time out
+    in a shorter time, not the proxy. This is wreaking havoc on large
+    downloads, similar to the issues that we had in the distant past with
+    jetty's default timeout being too short.
+
 2012-01-18 zzz
   * I2PTunnel: Register ports with the PortMapper
   * Router:
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 4e28a2c8d..c10128fe6 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 = 5;
+    public final static long BUILD = 6;
 
     /** for example "-test" */
     public final static String EXTRA = "";