diff --git a/Makefile b/Makefile
index ae06b575..400b89ca 100755
--- a/Makefile
+++ b/Makefile
@@ -428,7 +428,7 @@ bin-infos: bin-tree $(BDIR)/CD1/.disk/info
 $(BDIR)/CD1/.disk/info:
 	@echo "Generating the binary CD labels and their volume ids ..."
 	$(Q)set -e; \
-	 nb=`ls -l $(BDIR)/?.packages | wc -l | tr -d " "`; num=0;\
+	 nb=`ls -l $(BDIR)/?.packages $(BDIR)/??.packages | wc -l | tr -d " "`; num=0;\
 	 DATE=`date +%Y%m%d`; \
 	for i in $(BDIR)/*.packages; do \
 		num=$${i%%.packages}; num=$${num##$(BDIR)/}; \
@@ -459,7 +459,7 @@ src-infos: src-tree $(SDIR)/CD1/.disk/info
 $(SDIR)/CD1/.disk/info:
 	@echo "Generating the source CD labels and their volume ids ..."
 	$(Q)set -e; \
-	 nb=`ls -l $(SDIR)/?.sources | wc -l | tr -d " "`; num=0;\
+	 nb=`ls -l $(SDIR)/?.sources $(SDIR)/??.sources | wc -l | tr -d " "`; num=0;\
 	 DATE=`date +%Y%m%d`; \
 	for i in $(SDIR)/*.sources; do \
 		num=$${i%%.sources}; num=$${num##$(SDIR)/}; \
diff --git a/debian/changelog b/debian/changelog
index c68e7d9f..e47378cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,9 @@ debian-cd (2.2.22) UNRELEASED; urgency=low
     - Make woody's post-boot-mipsel script cope with extra fields in the
       output of sarge's isoinfo
     - Add Suggests: on netpbm and syslinux. Closes: #301345
-
+    - Count the total number of binary and source discs better; sarge can
+      have more than 9 CDs, so ?.packages doesn't cut it any more.
+	
  -- Joey Hess <joeyh@debian.org>  Thu, 14 Apr 2005 00:59:49 -0400
 
 debian-cd (2.2.21) unstable; urgency=low