2 files changed, 6 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 7d36c33..43542d5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -40,3 +40,4 @@ Jacob Anawalt <jlanawalt@gmail.com> -- pg_dump format option
 Sergio Talens-Oliag <sto@debian.org> -- pipefail fixes
 Bruno Bigras <bigras.bruno@gmail.com> -- enable tar handler in the build system
 casper -- Allow 'when = XXX' with spaces in .sh files.
+Chris Lamb <lamby@debian.org> -- rdiff.helper bugfix
diff --git a/ChangeLog b/ChangeLog
index ec12b6f..4953418 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,11 @@ version 0.9.10 -- UNRELEASED
 	sh:
 	 . Allow 'when = XXX' with spaces (Redmine#2769).
 	   Thanks to casper for the patch.
+    helper changes:
+	rdiff:
+	 . Fix infinite loop when version inconsistency is detected.
+	   Thanks to Chris Lamb <lamby@debian.org> for the patch.
+	   (Closes: #639547)
 version 0.9.9 -- May 15, 2011
     backupninja changes
 	 . Use locking to avoid running concurrent instances of the same backup