diff --git a/bin/xen-create-image b/bin/xen-create-image
index 14943e7..ef47a34 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -564,7 +564,7 @@ Install an X11 server, using VNC and XDM
  --
  http://www.steve.org.uk/
 
- $Id: xen-create-image,v 1.151 2007-06-02 11:48:18 radu Exp $
+ $Id: xen-create-image,v 1.152 2007-06-11 23:33:18 steve Exp $
 
 =cut
 
@@ -1239,7 +1239,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-        my $REVISION      = '$Revision: 1.151 $';
+        my $REVISION      = '$Revision: 1.152 $';
         if ( $REVISION =~ /1.([0-9.]+) / )
         {
             $REVISION = $1;
@@ -2478,6 +2478,15 @@ sub mountImage
 
 sub installSystem
 {
+    #
+    #  We might have a per-distro mirror.
+    my $distMirror = "mirror_" . $CONFIG{'dist'};
+    if ( $CONFIG{$distMirror} && length( $CONFIG{$distMirror} ) )
+    {
+        $CONFIG{'mirror'} = $CONFIG{$distMirror};
+    }
+
+    #
     #
     #  Basic command
     #
diff --git a/debian/changelog b/debian/changelog
index 7db8c6b..0fc1ef3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 
   * Only add Debian sources for security.debian.org if enabled upon
     the host.
+  * Allow per-dist mirrors.  Which is useful when working with mixed
+    Debian + Ubuntu installations.
 
 xen-tools (3.4-1) unstable; urgency=low
 
diff --git a/etc/xen-tools.conf b/etc/xen-tools.conf
index 514651a..237eb20 100644
--- a/etc/xen-tools.conf
+++ b/etc/xen-tools.conf
@@ -177,8 +177,7 @@ initrd      = /boot/initrd.img-`uname -r`
 #
 
 #
-# The default mirror for debootstrap which can be used to install
-# Debian Sid, Sarge, and Etch.
+# The default mirror for debootstrap to install Debian-derived distributions
 #
 mirror = http://ftp.us.debian.org/debian/
 
@@ -187,6 +186,20 @@ mirror = http://ftp.us.debian.org/debian/
 #
 # mirror = http://gb.archive.ubuntu.com/ubuntu/
 
+#
+#  If you like you could use per-distribution mirrors, which will
+# be more useful if you're working in an environment where you want
+# to regularly use multiple distributions:
+#
+# mirror_sid=http://ftp.us.debian.org/debian
+# mirror_sarge=http://ftp.us.debian.org/debian
+# mirror_etch=http://ftp.us.debian.org/debian
+# mirror_dapper=http://archive.ubuntu.com/ubuntu
+# mirror_edgy=http://archive.ubuntu.com/ubuntu
+# mirror_feisty=http://archive.ubuntu.com/ubuntu
+# mirror_gutsy=http://archive.ubuntu.com/ubuntu
+
+
 #
 #  Uncomment if you wish newly created images to boot once they've been
 # created.