diff --git a/debian/changelog b/debian/changelog
index df39b349..fdb27ccc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -146,6 +146,10 @@ debian-cd (3.0.0) UNRELEASED; urgency=low
   [ Colin Watson ]
   * Include prep support on powerpc images again.
 
+  [ Steve McIntyre ]
+  * Add Packages and Sources files to the Release file; clean up the
+    checksums. Closes: #402267
+
  -- Frans Pop <fjp@debian.org>  Thu,  7 Dec 2006 02:00:04 +0100
 
 debian-cd (2.2.25) unstable; urgency=low
diff --git a/tools/make_disc_trees b/tools/make_disc_trees
index 33fa1bc2..340102de 100755
--- a/tools/make_disc_trees
+++ b/tools/make_disc_trees
@@ -123,14 +123,26 @@ finish_disc () {
 	    echo "$ok files missing for debootstrap" >> $LOG
 	fi
 
-	echo "  Finishing off md5sum.txt"
 	cd $CDDIR
+	echo "  Finishing off the Release file"
+	cd dists/$CODENAME
+	echo "MD5Sum:" >> Release
+	for FILE in `find */* -name Packages* -o -name Sources* -name Release`
+	do
+		SIZE=`stat -c '%s' $FILE`
+		MD5=`md5sum $FILE | awk '{print $1}'`
+		printf " %s %8d %s\n" $MD5 $SIZE $FILE >> Release
+	done
+	cd ../..
+
+	echo "  Finishing off md5sum.txt"
 	# Just md5 the bits we won't have seen already
 	find ./.disk ./dists -type f | xargs md5sum >> md5sum.txt
 	# And sort; it should make things faster for people checking
 	# the md5sums, as ISO9660 dirs are sorted alphabetically
 	LANG=C sort -uk2 md5sum.txt > md5sum.txt.tmp
 	mv -f md5sum.txt.tmp md5sum.txt
+
 	cd $BDIR
 
 	SIZE=`$SIZE_CHECK $CDDIR` 
diff --git a/tools/start_new_disc b/tools/start_new_disc
index 91ca203e..4bf09d16 100755
--- a/tools/start_new_disc
+++ b/tools/start_new_disc
@@ -278,7 +278,7 @@ if [ -e "$MIRROR/dists/$CODENAME/Release" ] ; then
 	sed -e "s/^Architectures: .*$/Architectures: $ARCHES/" \
 		$MIRROR/dists/$CODENAME/Release | \
 		sed -e "s|^Components: .*$|Components: $SECTIONS|" | \
-		perl -ne 'if (/^(MD5Sum|SHA1):/i) { $f=1; next } 
+		perl -ne 'if (/^(MD5Sum|SHA1|SHA256):/i) { $f=1; next } 
 		if ($f) { 
 		unless (/^ /) { print; $f=0 }
 		} else { print }' > dists/$CODENAME/Release