diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java
index 29c66bba6b..5bbefbadff 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java
@@ -62,7 +62,7 @@ class PeerState
   // If we have te resend outstanding requests (true after we got choked).
   private boolean resend = false;
 
-  private final static int MAX_PIPELINE = 1;
+  private final static int MAX_PIPELINE = 2;
   private final static int PARTSIZE = 64*1024; // default was 16K, i2p-bt uses 64KB
 
   PeerState(Peer peer, PeerListener listener, MetaInfo metainfo,
diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index 706138ab09..9a8f29a64f 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -91,6 +91,8 @@ public class SnarkManager implements Snark.CompleteListener {
             _config.setProperty(PROP_I2CP_HOST, "localhost");
         if (!_config.containsKey(PROP_I2CP_PORT))
             _config.setProperty(PROP_I2CP_PORT, "7654");
+        if (!_config.containsKey(PROP_I2CP_OPTS))
+            _config.setProperty(PROP_I2CP_OPTS, "inbound.length=1 inbound.lengthVariance=1 outbound.length=1 outbound.lengthVariance=1");
         if (!_config.containsKey(PROP_EEP_HOST))
             _config.setProperty(PROP_EEP_HOST, "localhost");
         if (!_config.containsKey(PROP_EEP_PORT))
diff --git a/history.txt b/history.txt
index 058d70a79e..1f0aead904 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,8 @@
-$Id: history.txt,v 1.507 2006-09-03 01:37:46 complication Exp $
+$Id: history.txt,v 1.508 2006-09-03 04:12:23 zzz Exp $
+
+2006-09-04  zzz
+    * Enable pipelining in i2psnark
+    * Make i2psnark tunnel default be 1 + 0-1
 
 2006-09-03  zzz
     * Add rate reporting to i2psnark
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 13cdd3ac61..f87f736a11 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.447 $ $Date: 2006-09-03 01:37:47 $";
+    public final static String ID = "$Revision: 1.448 $ $Date: 2006-09-03 04:12:22 $";
     public final static String VERSION = "0.6.1.24";
-    public final static long BUILD = 6;
+    public final static long BUILD = 7;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);