diff --git a/build_all.sh b/build_all.sh
index 2c5fe2ea..70337ecb 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -40,7 +40,7 @@ if [ -z "$IMAGETARGET" ] ; then
 	IMAGETARGET="official_images"
 fi
 
-for ARCHES in i386 amd64 armel armhf ia64 mips mipsel powerpc s390x sparc kfreebsd-amd64 kfreebsd-i386 source
+for ARCHES in i386 amd64 armel armhf arm64 mips mipsel powerpc s390x kfreebsd-amd64 kfreebsd-i386 source
 do
 	export ARCHES
 	echo "Now we're going to build CD for $ARCHES !"
diff --git a/debian/changelog b/debian/changelog
index 90364889..feeb781f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ debian-cd (3.1.16) UNRELEASED; urgency=medium
   * Update kernel flavours for armhf to just use armmp and armmp-lpae
   * Add trivial initial (non-booting) support for arm64, by copying and
     extending armhf for now.
+  * Update arch lists to match what's in Jessie: remove sparc and ia64,
+    add arm64.
 
   [ Philipp Hahn ]
   * Fix word-splitting regexp in generate_di_list. Closes: #758512.
diff --git a/update-cd b/update-cd
index 63488cb7..0cfb34e1 100755
--- a/update-cd
+++ b/update-cd
@@ -90,7 +90,7 @@ CAPCODE=`perl -e "print ucfirst("$CODENAME")"`
 export FIRSTVER CAPCODE
 
 if [ "$ARCHLIST"x = ""x ] ; then
-    ARCHLIST="armel armhf amd64 i386 ia64 mips mipsel powerpc s390x sparc source kfreebsd-amd64 kfreebsd-i386" # amd64 # all dealt with specially
+    ARCHLIST="arm64 armel armhf amd64 i386 mips mipsel powerpc s390x source kfreebsd-amd64 kfreebsd-i386" # amd64 # all dealt with specially
 fi
 
 export TDIR NONFREE VER MIRROR CODENAME OUT BASEDIR