diff --git a/TODO.markdown b/TODO.markdown
index ff74695..e807f97 100644
--- a/TODO.markdown
+++ b/TODO.markdown
@@ -181,11 +181,6 @@ Bugs to fix and features to add for 5.0
 
 * Use `Perl::Critic`
 
-* Make mirror choosing code more flexible so that it can depend on the
-  architecture. Obvious use case: Installing Sarge amd64 just works if
-  the mirror (archive of amd64.debian.net on archive.debian.org or a
-  mirror thereof) is given manually.
-
 Stuff from Steve's TODO list / Generic TODOs
 --------------------------------------------
 
diff --git a/bin/xen-create-image b/bin/xen-create-image
index 3643ae4..c1e1b68 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -789,6 +789,7 @@ use Env;
 use File::Path qw/ mkpath /;
 use File::Temp qw/ tempdir /;
 use File::Copy qw/ mv cp /;
+use File::Which;
 use Getopt::Long;
 use Pod::Usage;
 use Data::Dumper;
@@ -1325,7 +1326,7 @@ sub setupDefaultOptions
         $CONFIG{ 'mirror_'.$debdist } = $CONFIG{ 'mirror' }
     }
     foreach my $debdist (qw(sarge etch lenny)) {
-        $CONFIG{ 'mirror_'.$debdist } = 'http://archive.debian.org/debian';
+        $CONFIG{ 'mirror_'.$debdist } = 'http://archive.debian.org/debian-archive/debian';
     }
     # Initialize per distribution mirror defaults: Ubuntu
     foreach my $ubuntudist (qw(hardy lucid oneiric precise quantal raring)) {
@@ -1335,7 +1336,8 @@ sub setupDefaultOptions
         $CONFIG{ 'mirror_'.$ubuntudist } = 'http://old-releases.ubuntu.com/ubuntu';
     }
     $CONFIG{ 'apt_proxy' }     = '';
-    $CONFIG{ 'arch' }          = '';
+    $CONFIG{ 'arch' }          =
+        which('dpkg') ? `dpkg --print-architecture` : '';
     $CONFIG{ 'fs' }            = 'ext3';
     $CONFIG{ 'force' }         = 0;
     $CONFIG{ 'no_xen_ok' }     = 0;
@@ -1825,9 +1827,10 @@ sub checkArguments
     #
     if ( $CONFIG{ 'dist' } =~ /sarge/ and
          $CONFIG{ 'arch' } =~ /amd64/ and
-         $CONFIG{ 'mirror_sarge' } eq 'http://archive.debian.org/debian' )
+         $CONFIG{ 'mirror_sarge' } =~ m(/debian-archive/debian/?$))
     {
-        $CONFIG{ 'mirror_sarge' } = 'http://archive.debian.org/debian-amd64';
+        $CONFIG{ 'mirror_sarge' } =~
+            s(/debian-archive/debian/?)(/debian-archive/debian-amd64);
     }
 
     #
diff --git a/debian/changelog b/debian/changelog
index c5fd0c0..3500bb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,12 +14,14 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low
       + now understands the --extension option.
       + also outputs the file name of the config file
     - Fixes "--extension=" with empty parameter.
+    - Sarge amd64 case handle properly
     - Remove CVS revisions from --version output
     - Preliminary support for Debian Jessie and Ubuntu Raring
     - Preliminary support for xl toolstack
     - xen-create-image: Consistently use runCommand() instead of system()
     - Makefile accepts DESTDIR=…
     - Move examples from debian/examples to examples.
+    - Uses File::Which, added (build-) dependency on libfile-which-perl
   * Add debian/gbp.conf to be able to to build xen-tools with
     git-buildpackage.
   * Clean up debian/rules:
diff --git a/debian/control b/debian/control
index d7a52a8..7c2f1ce 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Build-Depends: debhelper (>= 7.0.0),
                devscripts,
                git,
                libfile-slurp-perl,
+               libfile-which-perl,
                libmoose-perl,
                libtest-pod-coverage-perl,
                libtest-pod-perl,
@@ -20,6 +21,7 @@ Architecture: all
 Depends: debootstrap | cdebootstrap,
          libconfig-inifiles-perl,
          libfile-slurp-perl,
+         libfile-which-perl,
          libtext-template-perl,
          openssh-client,
          perl-modules,