diff --git a/build.sh b/build.sh
index 40b250e5..65f5e3d3 100755
--- a/build.sh
+++ b/build.sh
@@ -10,11 +10,15 @@ fi
 
 make distclean
 make ${CODENAME}_status
-echo " ... checking your mirror"
-make mirrorcheck
-if [ $? -gt 0 ]; then
-	echo "ERROR: Your mirror has a problem, please correct it." >&2
-	exit 1
+if [ "$SKIPMIRRORCHECK" = "yes" ]; then
+    echo " ... WARNING: skipping mirror check"
+else
+    echo " ... checking your mirror"
+    make mirrorcheck
+    if [ $? -gt 0 ]; then
+	    echo "ERROR: Your mirror has a problem, please correct it." >&2
+	    exit 1
+    fi
 fi
 echo " ... selecting packages to include"
 if [ -e ${MIRROR}/dists/${CODENAME}/main/disks-${ARCH}/current/. ] ; then
diff --git a/tools/list2cds b/tools/list2cds
index f8f72eb9..7c6e8264 100755
--- a/tools/list2cds
+++ b/tools/list2cds
@@ -196,7 +196,7 @@ while (defined($_=<LIST>)) {
 	# nevertheless ... this may be removed once the udebs have a
 	# better depencency system
 	if ($packages{$_}{"IsUdeb"}) {
-	    add_to_cd($cd, $packages{$_}{"Size"}, []);
+	    add_to_cd($cd, $packages{$_}{"Size"}, [$_]);
 	} else {
 	    add_package ($_, ! $norecommends, ! $nosuggests);
 	}