diff --git a/debian/changelog b/debian/changelog
index 07038bec..cf156d37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ debian-cd (3.1.21-stretch) UNRELEASED; urgency=medium
     + Make tools/update_popcon exit with errors when it fails
     + Make tools/update_popcon deal with https on popcon.d.o
     + Ensure that in all places where we use -J we also use -joliet-long
+    + List jigdo and template files in SUMS files too
 
  -- Steve McIntyre <93sam@debian.org>  Mon, 19 Jun 2017 13:39:58 +0100
 
diff --git a/tools/imagesums b/tools/imagesums
index 9362f842..372623df 100755
--- a/tools/imagesums
+++ b/tools/imagesums
@@ -18,7 +18,7 @@ if [ "$CHECKSUMS"x = ""x ] ; then
 fi
 
 for SUM in $CHECKSUMS; do
-	UPSUM=`echo $SUM | tr 'a-z' 'A-Z'`
+	UPSUM=$(echo $SUM | tr 'a-z' 'A-Z')
 	FILE=$UPSUM"SUMS"$EXT
 	if [ $VERBOSE -eq 1 ] ; then
 	    echo "Clearing $PWD/$FILE"
@@ -28,8 +28,12 @@ done
 
 # 2 calls to find here to get the ordering right - we *really* want to
 # get the jigdo files first
-for file in `find * -name \*.jigdo` `find * -name \*.iso`; do
+for file in $(find * -name \*.jigdo -o -name \*.template -o -name \*.iso); do
+    iso=""
     case $file in
+        *.template)
+            JIGDO=1
+            ;;
         *.jigdo)
             iso=${file%%.jigdo}.iso
             JIGDO=1
@@ -45,26 +49,36 @@ for file in `find * -name \*.jigdo` `find * -name \*.iso`; do
     esac
 
 	for SUM in $CHECKSUMS; do
-		UPSUM=`echo $SUM | tr 'a-z' 'A-Z'`
+		UPSUM=$(echo $SUM | tr 'a-z' 'A-Z')
 		FILE=$UPSUM"SUMS"$EXT
 		CMD="$SUM"sum
 
-		grep -q $iso $FILE
-		if [ $? -ne 0 ] ; then
+		if [ "$iso"x != ""x ]; then
+		    grep -q $iso $FILE
+		    if [ $? -ne 0 ] ; then
 			CKSUM=""
 			if [ "$JIGDO" == 1 ] ; then
-				CKSUM=`zcat -f $file | grep -i "Image Hex $CMD" | \
-                       awk '{print $5}'`
+			    CKSUM=$(zcat -f $file | \
+					grep -i "Image Hex $CMD" | \
+			                awk '{print $5}')
 			fi
 			if [ "$CKSUM"x != ""x ] ; then
-				echo "$CKSUM  $iso" >> $FILE
-				grep $iso $FILE
+			    echo "$CKSUM  $iso" >> $FILE
+			    grep $iso $FILE
 			else
-				echo "No Jigdo help for $SUM, doing it the long way with $CMD"
-				$CMD $iso >> $FILE
-				grep $iso $FILE
+			    echo "No Jigdo help for $SUM, doing it the long way with $CMD"
+			    $CMD $iso >> $FILE
+			    grep $iso $FILE
 			fi
+		    fi
 		fi
 
+		# Also add the template file and jigdo file to the SUMS, if they exist
+		case $file in
+		    *.template|*.jigdo)
+			$CMD $file >> $FILE
+			grep $file $FILE
+			;;
+		esac
 	done
 done