diff --git a/NEWS.markdown b/NEWS.markdown
index cce64f5..fe13dfa 100644
--- a/NEWS.markdown
+++ b/NEWS.markdown
@@ -28,6 +28,13 @@ Distribution Releases Changes
 * Knows about code name for Debian 12 (Bookworm).
 * Considers Ubuntu Yakkety, Zesty and Artful being EoL.
 
+Other Changes
+-------------
+
+* Change all occurrences of `httpredir.debian.org` to
+  `deb.debian.org` except those for the `debian-archive`. The latter
+  now point to `archive.debian.org` directly.
+
 
 xen-tools 4.7 (released 23 Jan 2017)
 ====================================
diff --git a/bin/xen-create-image b/bin/xen-create-image
index 86ac5ec..ba7fc0c 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -245,12 +245,12 @@ and EVMS EXAMPLE.
    --mirror=url Setup the mirror to use when installing via
                 debootstrap. (Default value: mirror used in
                 /etc/apt/sources.list or for Debian
-                "http://httpredir.debian.org/debian/" and for Ubuntu
+                "http://deb.debian.org/debian/" and for Ubuntu
                 "http://archive.ubuntu.com/ubuntu/")
 
                 The above mentioned Debian mirror hostname
                 automatically tries to choose a more or less close
-                Debian mirror. See http://httpredir.debian.org/ for
+                Debian mirror. See http://deb.debian.org/ for
                 details.
 
    --apt_proxy=protocol://hostname:port/
diff --git a/bin/xt-guess-suite-and-mirror b/bin/xt-guess-suite-and-mirror
index 57810aa..6e4f5d5 100755
--- a/bin/xt-guess-suite-and-mirror
+++ b/bin/xt-guess-suite-and-mirror
@@ -52,9 +52,9 @@ full text of the license.
 # Fallback to Debian or Ubuntu in case we can't find anything
 my $fallback = 'Debian';
 
-# Which mirrors to use if everything else fails (httpredir.debian.org
+# Which mirrors to use if everything else fails (deb.debian.org
 # redirects to a working mirror nearby)
-my %fallback_mirror = ( Debian => 'http://httpredir.debian.org/debian/',
+my %fallback_mirror = ( Debian => 'http://deb.debian.org/debian/',
                         Ubuntu => 'http://archive.ubuntu.com/ubuntu/' );
 
 # Which suite to use if everything else fails. For Debian "stable"
diff --git a/debian/changelog b/debian/changelog
index 558da9e..2359c7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ xen-tools (4.8-1) UNRELEASED; urgency=medium
         Arno Bakker and Peter. (Fixes xen-tools/xen-tools#51)
       - Rename hooks/karmic/80-install-kernel to
         hooks/common/80-install-kernel-ubu and add according symlinks.
+    + Change all occurrences of httpredir.debian.org to deb.debian.org
+      except those for the debian-archive. The latter now point to
+      archive.debian.org directly.
 
     [ Nico Boehr ]
     + Add support for LVM thin provisioning.
diff --git a/etc/mirrors.conf b/etc/mirrors.conf
index 8388a13..155ab28 100644
--- a/etc/mirrors.conf
+++ b/etc/mirrors.conf
@@ -1,7 +1,7 @@
 # xen-tools default mirror configuration file
 
-debian =         http://httpredir.debian.org/debian
-debian_archive = http://httpredir.debian.org/debian-archive/debian
+debian =         http://deb.debian.org/debian
+debian_archive = http://archive.debian.org/debian
 
 ubuntu =         http://archive.ubuntu.com/ubuntu
 ubuntu_archive = http://old-releases.ubuntu.com/ubuntu