diff --git a/AUTHORS b/AUTHORS
index 332ecd0..8db37c1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -65,6 +65,9 @@ Contributions
   Nathan O'Sullivan <nathan [at] au.com.mammoth>
    - New features wrt. options and helper functions
 
+  Guillaume Pernot <gpernot [at] org.praksys>
+    - Fixed Sarge amd64 special case
+
   Walter Reiner <walter [at] at.wreiner>
    - Provided --image-dev + --swap-dev patch.
 
diff --git a/debian/changelog b/debian/changelog
index f2ec5c5..1b03674 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ xen-tools (4.2+dev-1) UNRELEASED; urgency=low
   * New upstream snapshot
     - Fixes bashism in "editor" roles script. Thanks Raphaël Halimi for
       the patch! (Closes: #605203)
+    - Fixes missing architecture check in Sarge amd64 special case. Thanks
+      to Guillaume Pernot! (Closes: #611397) Also changes default Sarge
+      amd64 mirror to http://archive.debian.org/debian-amd64/.
 
  -- Axel Beckert <abe@debian.org>  Tue, 08 Mar 2011 23:24:06 +0100