diff --git a/history.txt b/history.txt
index dd47b2809..9ddaeea7b 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2011-09-09 zzz
+  * TunnelDispatcher: Fix bug in -13 preventing participating
+    tunnels from being expired and causing high CPU usage
+
 2011-09-08 zzz
   * Blocklist: Include IP in shitlist reason
   * Ministreaming: Drop old classes replaced by streaming
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 31c35f8c3..ea17ad55f 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 = 14;
+    public final static long BUILD = 15;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
index 2f9462338..5c30c236f 100644
--- a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
+++ b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
@@ -792,8 +792,9 @@ public class TunnelDispatcher implements Service {
                 if (exp < now) {
                     _configs.poll();
                     remove(cur);
-                } else if (exp < nextTime) {
-                    nextTime = exp;
+                } else {
+                    if (exp < nextTime)
+                        nextTime = exp;
                     break;
                 }
             }