diff --git a/debian/changelog b/debian/changelog
index 05ccf657..d9c66e77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,9 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
     + Tweak the date used for snapshot.d.o references - use *tomorrow*
       rather than today, to allow time for the snapshot to be updated.
     + Provide hashes for uncompressed Translation-* again. Closes: #767253
+    + Updates for update-cd:
+      - Grab checksums from the binary-all Packages.gz too when building
+      - Generate checksums for torrents and jigdo files too if desired
 
  -- Steve McIntyre <93sam@debian.org>  Mon, 20 Apr 2015 12:36:57 +0100
 
diff --git a/update-cd b/update-cd
index bb08179d..d2156a13 100755
--- a/update-cd
+++ b/update-cd
@@ -1,9 +1,7 @@
 #!/bin/bash
 #
-# $Id$
-# 
-# (c) Steve McIntyre <stevem@chiark.greenend.org.uk> Released under
-# GNU GPL v2 1st January 2001
+# (c) Steve McIntyre <steve@einval.com> 2001-2017
+# GNU GPL v2
 #
 # Quick and dirty script to create update CDs for people to upgrade
 # from an initial stable release (r0) to the latest point release level
@@ -15,13 +13,12 @@ set -e
 
 # Where is your mirror?
 MIRROR_NORM=/srv/cdbuilder.debian.org/src/ftp/debian
-MIRROR_AMD64=/srv/cdbuilder.debian.org/src/ftp/debian-amd64/debian
 
 # Do you want non-free? 1 for yes, 0 for no
 NONFREE=0
 
 # What release version is this?
-VER=8.10.0
+VER=9.1.0
 
 # Is this an official CD?
 OFFICIAL=Official
@@ -69,7 +66,7 @@ esac
 # Location of the diff file to use to determine the changes. If you leave
 # this blank, we'll try to determine the changes from the ChangeLog files,
 # which is probably less accurate. 
-DIFF=/home/debian-cd/lists/jessie/r0-r10.diff
+DIFF=/home/debian-cd/lists/jessie/r0-r11.diff
 
 if [ "$TYPE" = "cd" ] ; then
     CDSIZE=644 # megabytes, leaving space for metadata
@@ -169,6 +166,7 @@ make_cd () {
             -jigdo-force-md5 /pool/ \
             -md5-list $UPD/md5-check \
             $UPD/CD$CDNUM 2>&1 | grep "extents written"
+#            $UPD/CD$CDNUM
 	if [ $? -ne 0 ] ; then
 	    echo "${MKISOFS} failed, error $?"
 	    exit 1
@@ -187,7 +185,12 @@ make_cd () {
             awk '/Image Hex MD5Sum/ {print $5}'`
         echo "$MD5  ${BASENAME}.iso" >> ${JIGDODIR}/MD5SUMS.update
         echo "$MD5  ${BASENAME}.iso" >> ${ISODIR}/MD5SUMS.update
-        [ $BT = 1 ] && echo "$MD5  ${BASENAME}.iso" >> ${BTDIR}/MD5SUMS.update
+	(cd ${JIGDODIR} && md5sum ${BASENAME}.jigdo ${BASENAME}.template >> MD5SUMS.update)
+        if [ $BT = 1 ]; then
+            ~/build.${CODENAME}/mktorrent ${ISODIR}/${BASENAME}.iso
+            echo "$MD5  ${BASENAME}.iso" >> ${BTDIR}/MD5SUMS.update
+            (cd ${BTDIR} && md5sum ${BASENAME}.iso.torrent >> MD5SUMS.update)
+        fi
         for SHA_SIZE in 1 256 512; do
             SHA=`cat ${JIGDODIR}/${BASENAME}.jigdo | \
                 awk "/Image Hex SHA${SHA_SIZE}Sum/ {print \\$5}"`
@@ -197,7 +200,11 @@ make_cd () {
             fi
             echo "$SHA  ${BASENAME}.iso" >> ${JIGDODIR}/SHA${SHA_SIZE}SUMS.update
             echo "$SHA  ${BASENAME}.iso" >> ${ISODIR}/SHA${SHA_SIZE}SUMS.update
-            [ $BT = 1 ] && echo "$SHA  ${BASENAME}.iso" >> ${BTDIR}/SHA${SHA_SIZE}SUMS.update
+            (cd ${JIGDODIR} && sha${SHA_SIZE}sum ${BASENAME}.jigdo ${BASENAME}.template >> SHA${SHA_SIZE}SUMS.update)
+            if [ $BT = 1 ]; then
+                echo "$SHA  ${BASENAME}.iso" >> ${BTDIR}/SHA${SHA_SIZE}SUMS.update
+                (cd ${BTDIR} && sha${SHA_SIZE}sum ${BASENAME}.iso.torrent >> SHA${SHA_SIZE}SUMS.update)
+            fi
         done
         gzip -9 ${JIGDODIR}/${BASENAME}.jigdo
         mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo
@@ -280,7 +287,7 @@ if [ "$NONFREE"x != "1"x ] ; then
     mv -f $UPD/list1 $UPD/list
 fi
 
-$GRAB_MD5 $MIRROR_NORM "$ARCHLIST" $CODENAME $CODENAME $UPD/md5-check
+$GRAB_MD5 $MIRROR_NORM "$ARCHLIST all" $CODENAME $CODENAME $UPD/md5-check
 
 for THISARCH in $ARCHLIST
 do