diff --git a/Makefile b/Makefile
index 4885c0a..25a4f8f 100644
--- a/Makefile
+++ b/Makefile
@@ -178,6 +178,7 @@ install-hooks:
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d squeeze.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d wheezy.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d jessie.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d stretch.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d sid.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d testing.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d stable.d
diff --git a/README.markdown b/README.markdown
index ac33e70..44696eb 100644
--- a/README.markdown
+++ b/README.markdown
@@ -36,7 +36,8 @@ known to work reliably, i.e.:
 * Lenny 5.0
 * Squeeze 6.0
 * Wheezy 7
-* Jessie 8 (under development)
+* Jessie 8
+* Stretch 9 (under development)
 * Sid (always under development; works at least at the moment of writing :-)
 
 ### Ubuntu
diff --git a/bin/xen-create-image b/bin/xen-create-image
index e9025bd..d25a900 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -1251,7 +1251,7 @@ sub setupDefaultOptions
     $CONFIG{ 'mirror' }        = '';
 
     # Initialize per distribution mirror defaults: Debian
-    foreach my $debdist (qw(squeeze wheezy jessie sid testing oldstable stable unstable)) {
+    foreach my $debdist (qw(squeeze wheezy jessie stretch sid testing oldstable stable unstable)) {
         $CONFIG{ 'mirror_'.$debdist } = 'http://httpredir.debian.org/debian';
     }
     foreach my $debdist (qw(sarge etch lenny)) {
diff --git a/debian/changelog b/debian/changelog
index 64e6674..1cac11e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xen-tools (4.5+dev-1) UNRELEASED; urgency=medium
     + Fix usage of nonexistent variable in removeDebianPackage (Closes:
       #774936) Thanks Lukas Schwaighofer!
     + Change all occurrences of http.debian.net to httpredir.debian.org
+    + Preliminary support for Debian 9 Stretch.
   * Update Vcs-* headers as Gitorious will close its doors in June.
 
  -- Axel Beckert <abe@debian.org>  Fri, 09 Jan 2015 13:10:37 +0100
diff --git a/debian/control b/debian/control
index 47b8a37..706debb 100644
--- a/debian/control
+++ b/debian/control
@@ -57,7 +57,8 @@ Description: Tools to manage Xen virtual servers
    * Debian 5.0 Lenny
    * Debian 6.0 Squeeze
    * Debian 7 Wheezy
-   * Debian 8 Jessie (under development)
+   * Debian 8 Jessie
+   * Debian 9 Stretch (under development)
    * Debian Sid (Unstable)
    * Ubuntu 6.06 Dapper Drake (LTS)
    * Ubuntu 6.10 Edgy Eft
diff --git a/etc/xen-tools.conf b/etc/xen-tools.conf
index a3e9eba..c9d343d 100644
--- a/etc/xen-tools.conf
+++ b/etc/xen-tools.conf
@@ -276,6 +276,7 @@ mirror = `xt-guess-suite-and-mirror --mirror`
 # mirror_squeeze = http://httpredir.debian.org/debian
 # mirror_wheezy = http://httpredir.debian.org/debian
 # mirror_jessie = http://httpredir.debian.org/debian
+# mirror_stretch = http://httpredir.debian.org/debian
 # mirror_sid = http://httpredir.debian.org/debian
 # mirror_dapper = http://old-releases.ubuntu.com/ubuntu
 # mirror_edgy = http://old-releases.ubuntu.com/ubuntu