diff --git a/builder/website/index b/builder/website/index
index 38259223e..0d48ac5a3 100644
--- a/builder/website/index
+++ b/builder/website/index
@@ -736,3 +736,34 @@ notes=Ubuntu 14.04 (Trusty).
  image contains a user account 'builder'.  I have disabled it, so that
  people who don't read release notes don't get caught out, but you might
  still wish to delete it completely.
+
+[ubuntu-16.04]
+name=Ubuntu 16.04 (Xenial)
+osinfo=ubuntuxenial
+arch=x86_64
+file=ubuntu-16.04.xz
+checksum=56f9f7621fc5f60a01d0c2471fcddaa449979871aeaacb4d936b733f031dd40bb3c29fe73f8636dcaceb6c1413ebb1feff7381f1b24695e9750d106e243884d1
+format=raw
+size=4294967296
+compressed_size=232828552
+expand=/dev/sda1
+notes=Ubuntu 16.04 (Xenial).
+ 
+ This is a minimal Ubuntu 16.04 (Xenial) install.
+ 
+ Only the openssh-server package is selected in tasksel.
+ The preseed and virt-install scripts that produced this image
+ can be found in the libguestfs source tree:
+ 
+ builder/website/ubuntu.preseed
+ builder/website/ubuntu.sh
+ 
+ This image does not contain SSH host keys.  To regenerate them use:
+ 
+ --firstboot-command "dpkg-reconfigure openssh-server"
+ 
+ IMPORTANT NOTE: It seems to be impossible to create an Ubuntu >= 14.04
+ image using preseed without creating a user account.  Therefore this
+ image contains a user account 'builder'.  I have disabled it, so that
+ people who don't read release notes don't get caught out, but you might
+ still wish to delete it completely.
diff --git a/builder/website/index.asc b/builder/website/index.asc
index 02173c7ef..103af530c 100644
--- a/builder/website/index.asc
+++ b/builder/website/index.asc
@@ -734,6 +734,37 @@ notes=Ubuntu 14.04 (Trusty).
  
  --firstboot-command "dpkg-reconfigure openssh-server"
  
+ IMPORTANT NOTE: It seems to be impossible to create an Ubuntu >= 14.04
+ image using preseed without creating a user account.  Therefore this
+ image contains a user account 'builder'.  I have disabled it, so that
+ people who don't read release notes don't get caught out, but you might
+ still wish to delete it completely.
+
+[ubuntu-16.04]
+name=Ubuntu 16.04 (Xenial)
+osinfo=ubuntuxenial
+arch=x86_64
+file=ubuntu-16.04.xz
+checksum=56f9f7621fc5f60a01d0c2471fcddaa449979871aeaacb4d936b733f031dd40bb3c29fe73f8636dcaceb6c1413ebb1feff7381f1b24695e9750d106e243884d1
+format=raw
+size=4294967296
+compressed_size=232828552
+expand=/dev/sda1
+notes=Ubuntu 16.04 (Xenial).
+ 
+ This is a minimal Ubuntu 16.04 (Xenial) install.
+ 
+ Only the openssh-server package is selected in tasksel.
+ The preseed and virt-install scripts that produced this image
+ can be found in the libguestfs source tree:
+ 
+ builder/website/ubuntu.preseed
+ builder/website/ubuntu.sh
+ 
+ This image does not contain SSH host keys.  To regenerate them use:
+ 
+ --firstboot-command "dpkg-reconfigure openssh-server"
+ 
  IMPORTANT NOTE: It seems to be impossible to create an Ubuntu >= 14.04
  image using preseed without creating a user account.  Therefore this
  image contains a user account 'builder'.  I have disabled it, so that
@@ -742,17 +773,17 @@ notes=Ubuntu 14.04 (Trusty).
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
-iQIcBAEBAgAGBQJW/RtPAAoJEJFzj3Pht2igSAcP/2BoaxHYw94kkyeb9KxYfqHf
-/toJCsp/jpVFour/rcsW2roNW1G73JOymEbAss++n01BeyLceNPotHh3Z96A8hI6
-7Z4PPp//6wAhmqjLCkVP1XUvSewBNNhpjQZ3UdOkbWdHvLNLVAtVzr+i4+kU3byf
-6rwMSX8v/Eil7mB0OJUqSBpsbMozXZW8DEjabUzZabumgHs2W3pLE2jGbDOdfdt1
-4D9ysc9g7pujKBSPALrEcRk3/9RKo/3A8vuiqNdHjoLyQQFDJZgq4r6CBrfffMrq
-fw7hspyRXeoRQweC3vAp95u+pl3iZb5g/7z6ghsm/qy+S9Fc2hpHV+12HxgrI6uC
-wVuvO/ZAT7H032AmP0UoMmURyONM/L77HaahMyeYuHk4bMjhDXraobhNdi7/D4zG
-39DgZL1K5rwXLWw678jMpp2Ru9rOayAd/2fQi41kyMkaBL1U3Q1/t6VMeIZpcxqk
-UoO013kRMpynRlb+9B+a0M+NtoVmXtfCUl4cinbCm087dO/ZGOfHGCvX8vvzdddZ
-Ve1klunABjti5x63aDMmBm4mo8AZK/GrgqFo/xipneCuj+BzPPoohgCbr3UibIdD
-gpcdQSS5EVhvmeXaJjv3kYEPPC14JvO3LkXuwubeaa3kqpKEDZlZ+urvOO18LGN6
-QYGI/9Rw82CyLgLqNthY
-=53eq
+iQIcBAEBAgAGBQJXGMp3AAoJEJFzj3Pht2ig3aAP/ih+V4dicQhQteTcw8cYHyf0
+xK/GVkrGzMVLklYt+mZiUMKj2rwkQfp9tAfRiGAhfkYyBUX1At2xofsaZKZ53eyW
+WIwOcke0uqRqMyVo4cPjpZUrSeA7x+BIh+A+dGV92h0G9K6DpKU1PGdEBGjQeMuI
+AAPz9oyfMc3dORI5HW4tLu5wYrEYiksW4AwyHK8kwi4b461TeKBdM6atjIWtbRfg
+jhLMOVRYrNfUbKo6hJEvu2HLkj/CiUbn6i692607knKeSY4Epm5UItaAH1ErAfgk
+wwp0gaAHjWNc9GQiwVmTW7v/Oi+Bs7015/wEHTY6CbuTx8UIliq9flXP4RtUkN0l
+w8zOSP1PEOBWSWvAUpK1C9ogkQ3H9ajEb/+bWDjRsoDziuWs8AzTI+P60DN/4oZm
+wcZNOpvCaG+nkoLnkUrsSU06mOJPTNFGPpKXzUzQCRkSfkEZD1F0AEv6HRMKky2i
+TuXTW/5AaTmutSczLu+RlSU9d9t0UYn+erOAQAUpyjNb14N8zuYyXuUhRKBz3MTr
+Ay045HwVcsMAaDHMwlwX/wkdjDbvkvGxr8tJ9Q/8ADoZ45ESgHwqpw5ZozRhrCWQ
+D5jHJ4YG9inIKZQkXV63Ftrev6wOQp2V1DEFJGxlaqnFh5VOHVh9teU7zjKfpCXc
+wOcn37AvSvmbTIMIn2pp
+=OoeT
 -----END PGP SIGNATURE-----