diff --git a/builder/templates/debian-10.index-fragment b/builder/templates/debian-10.index-fragment
new file mode 100644
index 000000000..11ca74f5a
--- /dev/null
+++ b/builder/templates/debian-10.index-fragment
@@ -0,0 +1,24 @@
+[debian-10]
+name=Debian 10 (buster)
+osinfo=debian10
+arch=x86_64
+file=debian-10.xz
+checksum[sha512]=264d340e843d349f8caee14add56da4de95b22224ec48c6b3d9245afc764e4d460edabaf16fe6e4026008383128dc878a6d85eaf5dc55d66cef55cca88929c05
+format=raw
+size=6442450944
+compressed_size=218919120
+expand=/dev/sda1
+notes=Debian 10 (buster)
+ 
+ This is a minimal Debian install.
+ 
+ This image is so very minimal that it only includes an ssh server
+ 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/builder/templates/debian-10.virt-install-cmd b/builder/templates/debian-10.virt-install-cmd
new file mode 100644
index 000000000..686c376a4
--- /dev/null
+++ b/builder/templates/debian-10.virt-install-cmd
@@ -0,0 +1,20 @@
+# This is the virt-install command which was used to create
+# the virt-builder template 'debian-10'
+# NB: This file is generated for documentation purposes ONLY!
+# This script was never run, and is not intended to be run.
+
+'virt-install' \
+    '--transient' \
+    '--name=tmp-ksggvz66' \
+    '--ram=2048' \
+    '--arch=x86_64' \
+    '--cpu=host' \
+    '--vcpus=4' \
+    '--os-variant=debian8' \
+    '--initrd-inject=/tmp/dqaxqsv8.tmp/preseed.cfg' \
+    '--extra-args=auto mirror/http/proxy= console=tty0 console=ttyS0,115200 rd_NO_PLYMOUTH' \
+    '--disk=/home/rjones/d/libguestfs/builder/templates/tmp-ksggvz66.img,size=6,format=raw' \
+    '--location=http://deb.debian.org/debian/dists/buster/main/installer-amd64' \
+    '--serial=pty' \
+    '--nographics' 
+
diff --git a/builder/templates/make-template.ml b/builder/templates/make-template.ml
index 03c2a6250..a52c89912 100755
--- a/builder/templates/make-template.ml
+++ b/builder/templates/make-template.ml
@@ -352,6 +352,7 @@ and os_of_string os ver =
   | "debian", "7" -> Debian (7, "wheezy")
   | "debian", "8" -> Debian (8, "jessie")
   | "debian", "9" -> Debian (9, "stretch")
+  | "debian", "10" -> Debian (10, "buster")
   | "ubuntu", "10.04" -> Ubuntu (ver, "lucid")
   | "ubuntu", "12.04" -> Ubuntu (ver, "precise")
   | "ubuntu", "14.04" -> Ubuntu (ver, "trusty")
diff --git a/website/download/builder/index b/website/download/builder/index
index 7240e57db..b3c29a224 100644
--- a/website/download/builder/index
+++ b/website/download/builder/index
@@ -215,6 +215,30 @@ notes=CirrOS 0.3.5
  and was prepared by running ‘qemu-img convert .. -O raw’ followed by
  ‘xz --best’.
 
+[debian-10]
+name=Debian 10 (buster)
+osinfo=debian10
+arch=x86_64
+file=debian-10.xz
+checksum[sha512]=264d340e843d349f8caee14add56da4de95b22224ec48c6b3d9245afc764e4d460edabaf16fe6e4026008383128dc878a6d85eaf5dc55d66cef55cca88929c05
+format=raw
+size=6442450944
+compressed_size=218919120
+expand=/dev/sda1
+notes=Debian 10 (buster)
+ 
+ This is a minimal Debian install.
+ 
+ This image is so very minimal that it only includes an ssh server
+ 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.
+
 [debian-6]
 name=Debian 6 (Squeeze)
 osinfo=debian6
diff --git a/website/download/builder/index.asc b/website/download/builder/index.asc
index b037dd13c..ee4ec52a9 100644
--- a/website/download/builder/index.asc
+++ b/website/download/builder/index.asc
@@ -218,6 +218,30 @@ notes=CirrOS 0.3.5
  and was prepared by running ‘qemu-img convert .. -O raw’ followed by
  ‘xz --best’.
 
+[debian-10]
+name=Debian 10 (buster)
+osinfo=debian10
+arch=x86_64
+file=debian-10.xz
+checksum[sha512]=264d340e843d349f8caee14add56da4de95b22224ec48c6b3d9245afc764e4d460edabaf16fe6e4026008383128dc878a6d85eaf5dc55d66cef55cca88929c05
+format=raw
+size=6442450944
+compressed_size=218919120
+expand=/dev/sda1
+notes=Debian 10 (buster)
+ 
+ This is a minimal Debian install.
+ 
+ This image is so very minimal that it only includes an ssh server
+ 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.
+
 [debian-6]
 name=Debian 6 (Squeeze)
 osinfo=debian6
@@ -1032,18 +1056,18 @@ notes=Ubuntu 18.04 (bionic)
 
 -----BEGIN PGP SIGNATURE-----
 
-iQJFBAEBCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAlzN7rMRHHJpY2hAYW5u
-ZXhpYS5vcmcACgkQkXOPc+G3aKBG9RAAizMvdnHFMAFTF2JPiGXS3DaFPizSCnjW
-Rwm1+TfLhEg/XDlqWplLiWv+oK+cMNHak4Fk7XthOYBfL8eCvf3yO/Hk1AdL6K/3
-Q4qSLvmELo8FxzgY+ee5P8irzfPSQ5ihdE7lRFrcauC3gwXmCy2l0UcwImyzTB+P
-5vHdRoKay8MgE7xRGLN7gd1LM9AYi2fTXwGD7UnlSYn9XHmzonmqqp+nTudJIWAd
-gcIu44R6jx6pM55/W7f4aYb1IhpUA6DMZ+/kDWIAo+CWfA1wwnCTHW7P25L6PkMf
-+wjmcvXmmR5E/nTMG47/MdgD5LapgnGyFNu7EyMUqVIfTVmIDv3Rh2WHbtj6hfgd
-0qnziis5H3jKgOdufGidbuEz2KMBlcNsV7PktqSldWRFnq+XyiOoiiIccQgcLobY
-tNisZgS/+pDYKz2Nn4KpQnSTIIiwCF17PGXX/BYsxyEi6Tdo/BMvzV6RU8ho51Iw
-sPeO5v8QqbK+fgUpUJ/JZ+gcAZsZXHPH7VzLa0V0WbCN/8NWRHWusvbrAO6PXaS3
-IYNSEHRMLya/rgC1F6vP3OEruZ5a59Wjc2qVYd2On4otZ9HiPlB5iTp3/E5nPGnb
-Cp3+ZT+N0jVI3V/i6j6DyB60cH7D0h4HF3c/5y/3YLTVvU9BVTPEcwmAclwwDlMa
-nfVrPNFBkSE=
-=J1pP
+iQJFBAEBCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAl1cF74RHHJpY2hAYW5u
+ZXhpYS5vcmcACgkQkXOPc+G3aKDZFA/8DEMOdVnfpIcPJMYs4xWCQLx5dKY1w20E
+UVFabQaqBH1Jr6lq1fnQc5kAjy9GyviEWAi/Ea8oddvaGIhhyRQ7PGLNVQBlWcUr
+J0Dh9Gvye7TeTCky/j5LXB8vEYMywjAuKMqeJXZE3s711YjIP+J8Pa100ClLgDQU
+6AG4KUkU0/RdYi24uN0cMSYLIOk8E2CaKK5pAF5uwMjkmSIhvox/u8Fa5kOGbkg/
+PTEmPtAqc8vaJGhljq7cGRjAvAVqxPC/slRkIRXLf5LZdsnpZEHIKsWP+R+1j9Eg
+iT6sQbIZXiiar+EZ4nKtpdLH9vgbpqTTeq2X6ov+e6G2CMUWJnS11JA0HoPL7JqT
+FY06Q+tx+qVsmRaGPKOD6cu8fVMySrb0fr1y5QM0GwiwrEeEkfCFCIEzIXaCeWHe
+BZPq+m7/4CrBQz6Elpb+XWwLq6ehbVUVxf/HfZnF8M6pyvtNf5RvxSa8fdULfxs/
+Crj30Dp2xS1nFb3CDKdqpdhjGrbkIMMBeEmE8KaNKXhS2/b5DrtCVPyhL3Ex/Iet
+ZbGu6K8xOdJd4KPWXNJ/y9xDiAsOWUP8MFDMGAPFt1Ajbk7b4IfxTIBw5SSQJ5Mk
+NmoVaeRkeSCVmPbGCB7+sk4hHYV2OAu+krSFiMmcu3VriwmY6NvQzX0PEYhhR+oT
+k4SYn+F9oVY=
+=j0yN
 -----END PGP SIGNATURE-----