diff --git a/CONF.sh b/CONF.sh
index db211888..1b0ff078 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -41,6 +41,7 @@ unset BASE_INCLUDE      || true
 unset BASE_EXCLUDE      || true
 unset INSTALLER_CD      || true
 unset DI_CODENAME       || true
+unset MAXCDS		|| true
 
 
 # The debian-cd dir
@@ -261,3 +262,6 @@ export PUBLISH_PATH="/home/jigdo-area/"
 # INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer)
 # INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel)
 #export INSTALLER_CD=0
+
+# If set, limits the number of binary CDs to produce.
+#MAXCDS=1
diff --git a/debian/changelog b/debian/changelog
index 59881d70..d8907a93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
       of hw-detect.
     - Add tools/get_diskusage.pl (originally by Petter).
     - Add update-popcon Makefile target (taken from Skolelinux).
+    - Add MAXCDS config variable, which forces debian-cd to stop after a given
+      number of binary CDs.
   * Petter Reinholdtsen
     - Regenereated tasks/popularity-contest-sarge based on the current data.
     - Avoid kernel versions 2.4.24 and 2.6.3 on the first i386 CD, as we
diff --git a/tools/list2cds b/tools/list2cds
index 01306cd8..8e2916b9 100755
--- a/tools/list2cds
+++ b/tools/list2cds
@@ -23,6 +23,7 @@ my $complete = $ENV{'COMPLETE'} || 0;
 my $exclude = "$list.exclude";
 my $norecommends = $ENV{'NORECOMMENDS'} || 0;
 my $nosuggests = $ENV{'NOSUGGESTS'} || 1;
+my $maxcds = $ENV{'MAXCDS'} || 0;
 
 my $apt = "$ENV{'BASEDIR'}/tools/apt-selection";
 my $adir = "$ENV{'APTTMP'}/$ENV{'CODENAME'}-$ENV{'ARCH'}";
@@ -284,7 +285,14 @@ foreach (glob("$dir/*.packages")) {
 }
 
 # Now write the lists down
+my $numcds=0;
 foreach (sort { $a <=> $b } keys %cds) {
+	if ($maxcds && $numcds+1 > $maxcds) {
+		msg(0, "Stopping at CD $numcds\n");
+		last;
+	}
+	$numcds++;
+	
 	my $count = 0;
 	open(CDLIST, "> $dir/$_.packages") 
 			|| die "Can't write in $dir/$_.packages: $!\n";