diff --git a/ChangeLog b/ChangeLog
index 14a8604..0c6a46a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 ChangeLog for davfs2
 --------------------
 
+2009-06-12 Werner Baumann (werner.baumann@onlinehome.de)
+    * cache.c, set_next_upload_attempt:
+      Max. retry intervall for files must not exceed max_retry.
+
 2009-06-08 Werner Baumann (werner.baumann@onlinehome.de)
     * cache.c, write_node et al:
       Save member lock_expire to index file.
diff --git a/src/cache.c b/src/cache.c
index e964c4e..1397777 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -311,7 +311,8 @@ set_next_upload_attempt(dav_node *node)
     item->attempts++;
     if (item->attempts > MAX_UPLOAD_ATTEMPTS)
         return -1;
-    item->save_at += item->attempts * min_retry;
+    time_t delay = item->attempts * min_retry;
+    item->save_at += (delay > max_retry) ? max_retry : delay;
     return 0;
 }