diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
index 3b658b65e..647a7bd85 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
@@ -342,7 +342,8 @@ public class IndexBean {
         String pk = cur.getPrivKeyFile();
         if (pk == null)
             pk = _privKeyFile;
-        if (pk != null && pk.startsWith("i2ptunnel") && pk.endsWith("-privKeys.dat")) {
+        if (pk != null && pk.startsWith("i2ptunnel") && pk.endsWith("-privKeys.dat") &&
+            ((!isClient(cur.getType())) || cur.getPersistentClientKey())) {
             File pkf = new File(_context.getConfigDir(), pk);
             if (pkf.exists()) {
                 String name = cur.getName();
diff --git a/history.txt b/history.txt
index ac90d5b0f..295d634d2 100644
--- a/history.txt
+++ b/history.txt
@@ -1,5 +1,8 @@
 2012-02-20 zzz
-  * i2ptunnel: Fix streamr session registration
+  * i2ptunnel:
+    - Fix streamr session registration
+    - Don't delete privkey file for a non-persistent client tunnel
+      (ticket #599)
   * Streaming: Fix race NPE (thx echelon)
 
 2012-02-17 zzz
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 421ff4f63..098e16d49 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 = 16;
+    public final static long BUILD = 17;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";