diff --git a/build.sh b/build.sh
index 83372076..ab095598 100755
--- a/build.sh
+++ b/build.sh
@@ -6,5 +6,7 @@ set -e
 make distclean
 make ${CODENAME}_status
 make mirrorcheck
-make list COMPLETE=1 SIZELIMIT1=$((529 * 1024 * 1024)) SRCSIZELIMIT=$((635 * 1024 * 1024))
-make official_images
+disks=`du -sm ${MIRROR}/dists/${CODENAME}/main/disks-${ARCH}/current/. | \
+	awk '{print $1}'`
+make list COMPLETE=1 SIZELIMIT1=$(((630 - ${disks}) * 1024 * 1024)) SRCSIZELIMIT=$((635 * 1024 * 1024))
+make bin-official_images
diff --git a/build_all.sh b/build_all.sh
index 3c9a150c..9dc1e8ce 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -18,7 +18,10 @@ do
 		exit 1
 	fi
 	echo " ... selecting packages to include"
-	make list COMPLETE=1 SIZELIMIT1=$((529 * 1024 *1024)) SRCSIZELIMIT=$((635 * 1024 * 1024))
+	disks=`du -sm ${MIRROR}/dists/${CODENAME}/main/disks-${ARCH}/current/. | \
+	        awk '{print $1}'`
+	make list COMPLETE=1 SIZELIMIT1=$(((630 - ${disks}) * 1024 *1024)) \
+		SRCSIZELIMIT=$((635 * 1024 * 1024))
 	echo " ... building the images"
 	if [ "$ARCH" = "i386" ]; then
 		make official_images