diff --git a/core/java/src/net/i2p/util/EepGet.java b/core/java/src/net/i2p/util/EepGet.java
index ee0ea575d..b9792b94f 100644
--- a/core/java/src/net/i2p/util/EepGet.java
+++ b/core/java/src/net/i2p/util/EepGet.java
@@ -573,7 +573,6 @@ public class EepGet {
         
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("rc: " + responseCode + " for " + _actualURL);
-
         boolean rcOk = false;
         switch (responseCode) {
             case 200: // full
@@ -852,12 +851,12 @@ public class EepGet {
             buf.append("Cache-control: no-cache\r\n");
             buf.append("Pragma: no-cache\r\n");
         }
-        if (_etag != null) {
+        if ((_etag != null) && (_alreadyTransferred <= 0)) {
             buf.append("If-None-Match: ");
             buf.append(_etag);
             buf.append("\r\n");
         }
-        if (_lastModified != null) {
+        if ((_lastModified != null) && (_alreadyTransferred <= 0)) {
             buf.append("If-Modified-Since: ");
             buf.append(_lastModified);
             buf.append("\r\n");
diff --git a/history.txt b/history.txt
index 0c7d06ff8..ff20f057b 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,8 @@
-$Id: history.txt,v 1.590 2007-09-22 21:44:36 zzz Exp $
+$Id: history.txt,v 1.591 2007-09-26 22:52:34 zzz Exp $
+
+2007-10-07  Complication
+    * Fix an issue in EepGet whereby sending of "etag" and "lastModified" headers
+      broke retrying.
 
 2007-09-27  zzz
     * Implement pushback of NTCP transport backlog to the outbound tunnel selection code
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 7d62fb54e..c60720c3c 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.526 $ $Date: 2007-09-22 21:44:34 $";
+    public final static String ID = "$Revision: 1.527 $ $Date: 2007-09-26 22:52:32 $";
     public final static String VERSION = "0.6.1.29";
-    public final static long BUILD = 8;
+    public final static long BUILD = 9;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);