diff --git a/builder/templates/debian-9.index-fragment b/builder/templates/debian-9.index-fragment
new file mode 100644
index 000000000..293f9117f
--- /dev/null
+++ b/builder/templates/debian-9.index-fragment
@@ -0,0 +1,29 @@
+[debian-9]
+name=Debian 9 (stretch)
+osinfo=debian9
+arch=x86_64
+file=debian-9.xz
+checksum[sha512]=8f556a0ef907ecce2de22c2c3b06e3c2512e7f7c3e9a61b6c377ea39c8ccedf9f371f491678037c8357334b915346f2b4de793be34859d92f710a9596bd71148
+format=raw
+size=6442450944
+compressed_size=203644432
+expand=/dev/sda1
+notes=Debian 9 (stretch)
+ 
+ This is a minimal Debian install.
+ 
+ This image is so very minimal that it only includes an ssh server
+ and no virtual consoles.  To enable virtual consoles use this
+ virt-builder option:
+ 
+     --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,'
+ 
+ This image does not contain SSH host keys.  To regenerate them use:
+ 
+     --firstboot-command "dpkg-reconfigure openssh-server"
+ 
+ This template was generated by a script in the libguestfs source tree:
+     builder/templates/make-template.ml
+ Associated files used to prepare this template can be found in the
+ same directory.
+
diff --git a/website/download/builder/index b/website/download/builder/index
index 09f89afd7..a7edc9a2f 100644
--- a/website/download/builder/index
+++ b/website/download/builder/index
@@ -287,6 +287,35 @@ notes=Debian 8 (Jessie).
             s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=ttyS0,115200n8"/' \
  --run-command update-grub
 
+[debian-9]
+name=Debian 9 (stretch)
+osinfo=debian9
+arch=x86_64
+file=debian-9.xz
+checksum[sha512]=8f556a0ef907ecce2de22c2c3b06e3c2512e7f7c3e9a61b6c377ea39c8ccedf9f371f491678037c8357334b915346f2b4de793be34859d92f710a9596bd71148
+format=raw
+size=6442450944
+compressed_size=203644432
+expand=/dev/sda1
+notes=Debian 9 (stretch)
+ 
+ This is a minimal Debian install.
+ 
+ This image is so very minimal that it only includes an ssh server
+ and no virtual consoles.  To enable virtual consoles use this
+ virt-builder option:
+ 
+     --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,'
+ 
+ This image does not contain SSH host keys.  To regenerate them use:
+ 
+     --firstboot-command "dpkg-reconfigure openssh-server"
+ 
+ This template was generated by a script in the libguestfs source tree:
+     builder/templates/make-template.ml
+ Associated files used to prepare this template can be found in the
+ same directory.
+
 [fedora-18]
 name=Fedora® 18
 osinfo=fedora18
diff --git a/website/download/builder/index.asc b/website/download/builder/index.asc
index 4355f2922..a7600c0a4 100644
--- a/website/download/builder/index.asc
+++ b/website/download/builder/index.asc
@@ -290,6 +290,35 @@ notes=Debian 8 (Jessie).
             s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=ttyS0,115200n8"/' \
  --run-command update-grub
 
+[debian-9]
+name=Debian 9 (stretch)
+osinfo=debian9
+arch=x86_64
+file=debian-9.xz
+checksum[sha512]=8f556a0ef907ecce2de22c2c3b06e3c2512e7f7c3e9a61b6c377ea39c8ccedf9f371f491678037c8357334b915346f2b4de793be34859d92f710a9596bd71148
+format=raw
+size=6442450944
+compressed_size=203644432
+expand=/dev/sda1
+notes=Debian 9 (stretch)
+ 
+ This is a minimal Debian install.
+ 
+ This image is so very minimal that it only includes an ssh server
+ and no virtual consoles.  To enable virtual consoles use this
+ virt-builder option:
+ 
+     --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,'
+ 
+ This image does not contain SSH host keys.  To regenerate them use:
+ 
+     --firstboot-command "dpkg-reconfigure openssh-server"
+ 
+ This template was generated by a script in the libguestfs source tree:
+     builder/templates/make-template.ml
+ Associated files used to prepare this template can be found in the
+ same directory.
+
 [fedora-18]
 name=Fedora® 18
 osinfo=fedora18
@@ -1077,17 +1106,17 @@ notes=Ubuntu 16.04 (Xenial).
 
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAEBAgAGBQJZM8cUAAoJEJFzj3Pht2igBd8P/2GheR9Qd5UlLPRfu8mff4WP
-pEB1cycj+C3yZffBhl27/5cdHcxbov2qSMuAdAJPkbQf+fJtXI9V1zBF861mgvpy
-zwJ3E4x1atc7bnO3pj+xJJilBHTdPUb5cPMo4h62QBoex9fLWZQ1/RjtP5muOPWX
-UGVykNhjZI8obE8pOTXyIIYfu7fnwyAQdiB0ft0Q/onhSaHoUROAW7pEJJKZ5nfS
-kNdTGJ7Yw3IUmJbKM6yjoDGKcNlbJm6HJYPd+qRN3NdBETEs3cI1Nwc7orAg7xad
-A+Q97S1VjiKtFfMsZPzG7IyJox+Zm6qJzKXL1CydXTIQhvUUnUT73mNYsNlwjFsJ
-icqQ+tRF4e16pjJz7uqO4lC8Nue0eiRpA1Yd43rT4EHQkgVZE/zQ1VgnKEZ9VHyH
-sECISxCjlbsgZSUeSt/Lu9LDgTzgnDKbVGRc54uxnkuBFD3va+qiDKeJS1eUdGfP
-RJcchXajk+6/lpAtKsMjKR+CNBfm6ZLiM1s+h8U/VEeMRMt+8JLn/cVUIaFvYR/K
-6NZU+qoFgU9JPGziH1ozZzsIQ3SGTXMTVS0OAvxXhj4Gfe47ICaO1BtKtTx5e6OW
-HHTPr3etHKeWM+Jp6fy5oYC9+jLip99iJB+NWQj1sKdqB7e24E7liMUWBnSbCROJ
-zlmEtlF5ZQY2GZjQ34wO
-=Kscl
+iQIcBAEBAgAGBQJZUhx3AAoJEJFzj3Pht2igUWcQALwVg12hKRiNs/19JKAUd8HB
+7lchh1RkhXIsWZ25MfPR9RjpOMxtCYqM2priZh70S4lE8h4L+hiz9oclB8SJReOg
+SWBaPM5N042x0bH8mieSNtqAWXCGrIruYo79M5KzRnsjkWgMcia0QThL1ANADxQk
+yboYdh1rjOC3SeElIorsafRhy68nZeJKQwBNbS24TMe6jJHssI4ExttjRLahUHBh
+appYfvKfLtuYs8z0y2wlzCKS8m65xAFQ7+NfnMwvl66sVxISV51IxbzW4mAARs4c
+nVKA+AFRD66ZDrpqLt4C/zMmuEID4eVFGqstagdAuhDSWyYuoMKWvj5DfPgcEvsk
+Yxyda9Ifm8N9UYY0NpvGJHBPfq/Jpb9q80XId5mg0m3venTrm8plsVQaoeiXHbhj
+JctpEHjrT8ZNF1m/NUizQ57ARBFh4e9wW9hey9imcE+B36vVSNsy5HaRbgvcSzDG
++PTFgyC7J5/UQuxlsiuM3Pogy06bnn117EeGiZssj07j3wL/qkJkW6wTL13/wLA3
+ut5JMLNRLZ9iPPw3c4K88bZsxMsGlQSru8aogPwkve5Sm/xHh0me7xL60yIM3+ko
+3HckFIkU8mPrTsH+VPaDPqhnsHdxx5fXsSYf12AWFQFl9cp5aku1FGiRLOec5C9N
+uQdpgEkfM9c/p70As4mh
+=AM4/
 -----END PGP SIGNATURE-----