diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java
index 91569b751..8c24e7625 100644
--- a/core/java/src/net/i2p/CoreVersion.java
+++ b/core/java/src/net/i2p/CoreVersion.java
@@ -14,8 +14,8 @@ package net.i2p;
  *
  */
 public class CoreVersion {
-    public final static String ID = "$Revision: 1.48 $ $Date: 2005/11/15 22:20:21 $";
-    public final static String VERSION = "0.6.1.6";
+    public final static String ID = "$Revision: 1.49 $ $Date: 2005/11/26 13:26:22 $";
+    public final static String VERSION = "0.6.1.7";
 
     public static void main(String args[]) {
         System.out.println("I2P Core version: " + VERSION);
diff --git a/history.txt b/history.txt
index 42bf1e1a2..bbb4d8b5a 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,10 @@
-$Id: history.txt,v 1.339 2005/11/30 15:48:27 jrandom Exp $
+$Id: history.txt,v 1.340 2005/11/30 20:13:45 jrandom Exp $
+
+* 2005-12-01  0.6.1.7 released
+
+2005-12-01  jrandom
+    * Add a new criteria to the tunnel join throttle, backing off people if we
+      are failing to talk to our peers more than usual.
 
 2005-11-30  jrandom
     * Cleaned up the build process to deal with Jetty 5.1.6 and rename the
diff --git a/initialNews.xml b/initialNews.xml
index d049082ec..01b0a12ae 100644
--- a/initialNews.xml
+++ b/initialNews.xml
@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2005/11/15 22:20:22 $">
- <i2p.release version="0.6.1.6" date="2005/11/26" minVersion="0.6"
+<i2p.news date="$Date: 2005/11/26 13:26:24 $">
+ <i2p.release version="0.6.1.7" date="2005/12/01" minVersion="0.6"
               anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
               publicurl="http://dev.i2p.net/i2p/i2pupdate.sud"
               anonannouncement="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-September/000878.html" 
diff --git a/installer/install.xml b/installer/install.xml
index b3eb9ef64..81eaf3a0f 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -4,7 +4,7 @@
 
     <info>
         <appname>i2p</appname>
-        <appversion>0.6.1.6</appversion>
+        <appversion>0.6.1.7</appversion>
         <authors>
             <author name="I2P" email="support@i2p.net"/>
         </authors>
diff --git a/news.xml b/news.xml
index 2f548b061..d9b95bf2a 100644
--- a/news.xml
+++ b/news.xml
@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2005/11/15 22:20:22 $">
- <i2p.release version="0.6.1.6" date="2005/11/26" minVersion="0.6"
+<i2p.news date="$Date: 2005/11/26 13:26:24 $">
+ <i2p.release version="0.6.1.7" date="2005/12/01" minVersion="0.6"
               anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
               publicurl="http://dev.i2p.net/i2p/i2pupdate.sud"
               anonannouncement="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-September/000878.html" 
diff --git a/router/java/src/net/i2p/router/RouterThrottleImpl.java b/router/java/src/net/i2p/router/RouterThrottleImpl.java
index a5465439f..4c0edcac4 100644
--- a/router/java/src/net/i2p/router/RouterThrottleImpl.java
+++ b/router/java/src/net/i2p/router/RouterThrottleImpl.java
@@ -52,6 +52,7 @@ class RouterThrottleImpl implements RouterThrottle {
         _context.statManager().createRateStat("router.throttleTunnelBandwidthExceeded", "How much bandwidth is allocated when we refuse due to bandwidth allocation?", "Throttle", new long[] { 10*60*1000, 60*60*1000, 24*60*60*1000 });
         _context.statManager().createRateStat("router.throttleTunnelBytesAllowed", "How many bytes are allowed to be sent when we get a tunnel request (period is how many are currently allocated)?", "Throttle", new long[] { 10*60*1000, 60*60*1000, 24*60*60*1000 });
         _context.statManager().createRateStat("router.throttleTunnelBytesUsed", "Used Bps at request (period = max KBps)?", "Throttle", new long[] { 10*60*1000, 60*60*1000, 24*60*60*1000 });
+        _context.statManager().createRateStat("router.throttleTunnelFailCount1m", "How many messages failed to be sent in the last 2 minutes when we throttle based on a spike in failures (period = 10 minute average failure count)?", "Throttle", new long[] { 60*1000, 10*60*1000, 60*60*1000});
     }
     
     public boolean acceptNetworkMessage() {
@@ -79,6 +80,12 @@ class RouterThrottleImpl implements RouterThrottle {
     }
     
     public int acceptTunnelRequest(TunnelCreateMessage msg) { 
+        if (_context.getProperty(Router.PROP_SHUTDOWN_IN_PROGRESS) != null) {
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Refusing tunnel request since we are shutting down ASAP");
+            return TunnelHistory.TUNNEL_REJECT_CRIT;
+        }
+        
         long lag = _context.jobQueue().getMaxLag();
         RateStat rs = _context.statManager().getRate("router.throttleNetworkCause");
         Rate r = null;
@@ -117,14 +124,27 @@ class RouterThrottleImpl implements RouterThrottle {
             return TunnelHistory.TUNNEL_REJECT_TRANSIENT_OVERLOAD;
         }
         
-        int numTunnels = _context.tunnelManager().getParticipatingCount();
-
-        if (_context.getProperty(Router.PROP_SHUTDOWN_IN_PROGRESS) != null) {
-            if (_log.shouldLog(Log.WARN))
-                _log.warn("Refusing tunnel request since we are shutting down ASAP");
-            return TunnelHistory.TUNNEL_REJECT_CRIT;
+        rs = _context.statManager().getRate("transport.sendMessageFailureLifetime");
+        r = null;
+        if (rs != null)
+            r = rs.getRate(60*1000);
+        double failCount = (r != null ? r.getCurrentEventCount() + r.getLastEventCount() : 0);
+        if (failCount > 100) {
+            long periods = r.getLifetimePeriods();
+            long maxFailCount = r.getExtremeEventCount();
+            if ( (periods > 0) && (maxFailCount > 100) ) {
+                if (_context.random().nextInt((int)maxFailCount) <= failCount) {
+                    if (_log.shouldLog(Log.DEBUG))
+                        _log.debug("Refusing tunnel request with the job lag of " + lag 
+                                   + "since the 1 minute message failure count is too high (" + failCount + "/" + maxFailCount + ")");
+                    _context.statManager().addRateData("router.throttleTunnelFailCount1m", (long)failCount, (long)maxFailCount);
+                    return TunnelHistory.TUNNEL_REJECT_TRANSIENT_OVERLOAD;                    
+                }
+            }
         }
         
+        int numTunnels = _context.tunnelManager().getParticipatingCount();
+
         if (numTunnels > getMinThrottleTunnels()) {
             double growthFactor = getTunnelGrowthFactor();
             Rate avgTunnels = _context.statManager().getRate("tunnel.participatingTunnels").getRate(60*60*1000);
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 9dd14eaf9..efdb1cd8a 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.305 $ $Date: 2005/11/29 12:56:02 $";
-    public final static String VERSION = "0.6.1.6";
-    public final static long BUILD = 5;
+    public final static String ID = "$Revision: 1.306 $ $Date: 2005/11/30 15:48:26 $";
+    public final static String VERSION = "0.6.1.7";
+    public final static long BUILD = 0;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);