diff --git a/bin/xen-create-image b/bin/xen-create-image
index b028287..e5f19c6 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -1346,17 +1346,17 @@ sub setupDefaultOptions
     $CONFIG{ 'mirror' }        = '';
 
     # Initialize per distribution mirror defaults: Debian
-    foreach my $debdist (qw(etch lenny squeeze wheezy sid testing stable unstable)) {
+    foreach my $debdist (qw(lenny squeeze wheezy sid testing stable unstable)) {
         $CONFIG{ 'mirror_'.$debdist } = $CONFIG{ 'mirror' }
     }
-    foreach my $debdist (qw(sarge)) {
+    foreach my $debdist (qw(sarge etch)) {
         $CONFIG{ 'mirror_'.$debdist } = 'http://archive.debian.org/debian';
     }
     # Initialize per distribution mirror defaults: Ubuntu
-    foreach my $ubuntudist (qw(dapper hardy intrepid jaunty karmic lucid maverick natty)) {
+    foreach my $ubuntudist (qw(dapper hardy jaunty karmic lucid maverick natty)) {
         $CONFIG{ 'mirror_'.$ubuntudist } = 'http://archive.ubuntu.com/ubuntu';
     }
-    foreach my $ubuntudist (qw(edgy feisty gutsy)) {
+    foreach my $ubuntudist (qw(edgy feisty gutsy intrepid)) {
         $CONFIG{ 'mirror_'.$ubuntudist } = 'http://old-releases.ubuntu.com/ubuntu';
     }
     $CONFIG{ 'arch' }          = '';
diff --git a/debian/changelog b/debian/changelog
index efb2daa..faf7217 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ xen-tools (4.2-1) UNRELEASED; urgency=low
       Xen versions.
     - Preliminary support for Ubuntu 11.04 (Natty) and Debian 7.0 (Wheezy)
       (Closes: #597521)
+    - Switches default mirror for EoL'ed Ubuntu 8.10 (Intrepid) and Debian
+      4.0 (Etch) to the distributions' archives for old releases.
   * Does no more try extract the upstream changelog during package
     build. The commit which introduced this problem has been
     reverted. Document more clearly in debian/README.source how to build
diff --git a/etc/xen-tools.conf b/etc/xen-tools.conf
index 2a0bb17..cdb9e75 100644
--- a/etc/xen-tools.conf
+++ b/etc/xen-tools.conf
@@ -262,6 +262,7 @@ mirror = `xt-guess-suite-and-mirror --mirror`
 # http://wiki.debian.org/DebianGeoMirror):
 #
 # mirror_sarge = http://archive.debian.org/debian
+# mirror_etch = http://archive.debian.org/debian
 # mirror_lenny = http://cdn.debian.net/debian
 # mirror_squeeze = http://cdn.debian.net/debian
 # mirror_wheezy = http://cdn.debian.net/debian
@@ -271,7 +272,7 @@ mirror = `xt-guess-suite-and-mirror --mirror`
 # mirror_feisty = http://old-releases.ubuntu.com/ubuntu
 # mirror_gutsy = http://old-releases.ubuntu.com/ubuntu
 # mirror_hardy = http://archive.ubuntu.com/ubuntu
-# mirror_intrepid = http://archive.ubuntu.com/ubuntu
+# mirror_intrepid = http://old-releases.ubuntu.com/ubuntu
 # mirror_karmic = http://archive.ubuntu.com/ubuntu
 # mirror_lucid = http://archive.ubuntu.com/ubuntu
 # mirror_maverick = http://archive.ubuntu.com/ubuntu