diff --git a/squeeze/debian/changelog b/squeeze/debian/changelog
index 3aa9d17b..5b05e8b3 100644
--- a/squeeze/debian/changelog
+++ b/squeeze/debian/changelog
@@ -24,6 +24,8 @@ debian-cd (3.1.6) UNRELEASED-backport; urgency=low
     Closes: #615043
   * Update make_disc_trees.pl and which_deb to cope with different
     types of source file, and clean up the code in that area.
+  * tools/make_image: generate list files while we have the CD trees
+    available
 
  -- Raphaël Hertzog <hertzog@debian.org>  Fri, 04 Feb 2011 09:59:21 +0100
 
diff --git a/squeeze/tools/make_image b/squeeze/tools/make_image
index 3f886783..8c1828c1 100755
--- a/squeeze/tools/make_image
+++ b/squeeze/tools/make_image
@@ -119,9 +119,12 @@ do
         echo $CMD
         echo $CMD > CD$n/.disk/mkisofs
         eval "$CMD"
-	if [ $ISO_WANTED = 1 ] ; then
-	    chmod +r $OUT/$OUTFILE.iso
-	fi
+	    if [ $ISO_WANTED = 1 ] ; then
+	        chmod +r $OUT/$OUTFILE.iso
+	    fi
+
+        # Generate our listfile while we have the information to hand easily
+        find CD$n/pool -type f | sed 's?^.*/??g' | gzip -9 > $OUT/$OUTFILE.list.gz
     fi
 
     # If we've made jigdo files, tweak them with extra info now