diff --git a/Makefile b/Makefile
index 8aae7725..9b537e36 100755
--- a/Makefile
+++ b/Makefile
@@ -193,7 +193,7 @@ $(ADIR)/status:
 	@echo "Generating a fake status file for apt-get and apt-cache..."
 	$(Q)for ARCH in $(ARCHES); do \
 		mkdir -p $(ADIR)/$(CODENAME)-$$ARCH/apt/preferences.d; \
-		if [ $$ARCH = "source" -o "$(INSTALLER_CD)" = "1" -o "$(INSTALLER_CD)" = "2" ];then \
+		if [ $$ARCH = "source" -o "$(INSTALLER_CD)" = "1" -o "$(INSTALLER_CD)" = "2" -o "$(INSTALLER_CD)" = "C" ];then \
 			:> $(ADIR)/$(CODENAME)-$$ARCH/status ; \
 		else \
 			zcat $(MIRROR)/dists/$(CODENAME)/main/binary-$$ARCH/Packages.gz | \
@@ -281,7 +281,7 @@ $(BDIR)/rawlist:
 	$(Q)if [ "$(SOURCEONLY)"x != "yes"x ] ; then \
 		if [ "$(INSTALLER_CD)"x = "1"x ] ; then \
 			: ; \
-		elif [ "$(INSTALLER_CD)"x = "2"x ] ; then \
+		elif [ "$(INSTALLER_CD)"x = "2"x -o "$(INSTALLER_CD)"x = "C"x ] ; then \
 			echo -e "mawk" >>$(BDIR)/rawlist; \
 		else \
 			echo -e "mawk\nexim4-daemon-light" >>$(BDIR)/rawlist; \
diff --git a/build.sh b/build.sh
index c10723d7..2604ecfe 100755
--- a/build.sh
+++ b/build.sh
@@ -29,7 +29,7 @@ if [ "$TASK"x = ""x ] ; then
 			TASK=debian-installer
 			unset COMPLETE
 			;;
-		"2"x)
+		"2"x|"C"x)
 			TASK=debian-installer+kernel
 			unset COMPLETE
 			;;
diff --git a/build_all.sh b/build_all.sh
index 887d85fa..591684af 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -22,7 +22,7 @@ if [ "$TASK"x = ""x ] ; then
 			TASK=debian-installer
 			unset COMPLETE
 			;;
-		"2"x)
+		"2"x|"C"x)
 			TASK=debian-installer+kernel
 			unset COMPLETE
 			;;
diff --git a/tools/boot/squeeze/boot-x86 b/tools/boot/squeeze/boot-x86
index 0bac50ff..c0a5bdc5 100644
--- a/tools/boot/squeeze/boot-x86
+++ b/tools/boot/squeeze/boot-x86
@@ -70,7 +70,7 @@ fi
 
 BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz"
 # Only include disk images on full CDs, not on smaller images.
-#if [ "$ARCH" = i386 ] && [ "$INSTALLER_CD" != 1 ] && [ "$INSTALLER_CD" != 2 ]; then
+#if [ "$ARCH" = i386 ] && [ "$INSTALLER_CD" != 1 ] && [ "$INSTALLER_CD" != 2 ] && [ "$INSTALLER_CD" != C ]; then
 	#DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img"
 	#EXTRA_DISK_IMAGES="cdrom/boot.img"
 #fi
diff --git a/tools/start_new_disc b/tools/start_new_disc
index e1d49f8f..cf00344b 100755
--- a/tools/start_new_disc
+++ b/tools/start_new_disc
@@ -157,7 +157,7 @@ if [ $DISKNUM = 1 ] ; then
 				case "$INSTALLER_CD"x in
 					"1"x)
 						UDEB_INCLUDE=$DI_DATA_DIR/"$ARCH"_businesscard_udeb_include;;
-					"2"x)
+					"2"x|"C"x)
 						UDEB_INCLUDE=$DI_DATA_DIR/"$ARCH"_netinst_udeb_include;;
 					*)
 						UDEB_INCLUDE=$DI_DATA_DIR/"$ARCH"_udeb_include;;
@@ -168,7 +168,7 @@ if [ $DISKNUM = 1 ] ; then
 				case "$INSTALLER_CD"x in
 					"1"x)
 						UDEB_EXCLUDE=$DI_DATA_DIR/"$ARCH"_businesscard_udeb_exclude;;
-					"2"x)
+					"2"x|"C"x)
 						UDEB_EXCLUDE=$DI_DATA_DIR/"$ARCH"_netinst_udeb_exclude;;
 					*)
 						UDEB_EXCLUDE=$DI_DATA_DIR/"$ARCH"_udeb_exclude;;