diff --git a/CONF.sh b/CONF.sh
index c7c996f5..b7f58786 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -64,7 +64,8 @@ export BASEDIR=`pwd`
 # export CDNAME=debian
 
 # Building $codename cd set ...
-export CODENAME=forky
+# Keep it sid, even for the release
+export CODENAME=sid
 
 # By default use Debian installer packages from $CODENAME
 if [ -z "$DI_CODENAME" ]; then
@@ -88,7 +89,8 @@ fi
 #export DI_WWW_HOME=default
 
 # Version number, "10.11.0", "11.1.0", "testing", etc
-export DEBVERSION="14.0.0"
+#export DEBVERSION="14.0.0"
+export DEBVERSION="sid"
 
 # Official or non-official set.
 # NOTE: THE "OFFICIAL" DESIGNATION IS ONLY ALLOWED FOR IMAGES AVAILABLE
@@ -121,23 +123,26 @@ fi
 #	      images, however. Also, if you are using an NFS partition for
 #	      some part of this, you must use this option.
 # Paths to the mirrors
-export MIRROR=/srv/mirror/debian
+export MIRROR=/home/sthibault/archive/merge
+#export MIRROR=/srv/mirrors/debian
+#export MIRROR=/srv/mirrors/debian-ports
 
 # Path of the temporary directory
-export TDIR=/srv/mirror/tmp
+export TDIR=/home/sthibault/tmp
 
 # Path where the images will be written
-export OUT=/srv/mirror/debian-cd-test
+export OUT=/home/sthibault/cd
 
 # Where we keep the temporary apt stuff.
 # This cannot reside on an NFS mount.
-export APTTMP=/srv/mirror/tmp/apt
+export APTTMP=/home/sthibault/tmp/apt
 
 # Do I want to have NONFREE merged in the CD set?
 # export NONFREE=1
 
 # Do I want to have CONTRIB merged in the CD set?
 # export CONTRIB=1
+export CONTRIB=0
 
 # Where should I look for non-free packages?
 export NONFREE_COMPONENTS="non-free-firmware"
@@ -149,12 +154,12 @@ export NONFREE_COMPONENTS="non-free-firmware"
 # Do I want to force (potentially non-free, depending on the NONFREE_COMPONENTS
 # setting) firmware packages to be placed on disc 1? Will make installation
 # much easier if systems contain hardware that depends on this firmware
-export FORCE_FIRMWARE=1
+export FORCE_FIRMWARE=0
 
 # If you have a $MIRROR/dists/$CODENAME/local/binary-$ARCH dir with 
 # local packages that you want to put on the CD set then
 # uncomment the following line 
-# export LOCAL=1
+export LOCAL=1
 
 # If your local packages are not under $MIRROR, but somewhere else, 
 # you can uncomment this line and edit it to point to a directory
@@ -177,6 +182,8 @@ export FORCE_FIRMWARE=1
 # for year 2023, good luck! -- kibi
 #
 # export LOCALDEBS=/home/joey/debian/va/debian
+export LOCALDEBS=/home/sthibault/local
+export UPDATE_LOCAL=1
 
 # Where to find the security patches.  This directory should be the
 # top directory of a security.debian.org mirror.
@@ -189,10 +196,12 @@ export FORCE_FIRMWARE=1
 #export PROPOSED_UPDATES=$CODENAME-proposed-updates
 
 # Include packages from Debian Ports unreleased
-#export UNRELEASED=1
+export UNRELEASED=1
 
 # Sparc only : bootdir (location of cd.b and second.b)
 # export BOOTDIR=/boot
+# EFI is currently broken, and EFI's grub.cfg overwrites BIOS's grub.cfg
+export BOOT_METHODS="BIOS"
 
 # Symlink farmers should uncomment this line :
 # export SYMLINK=1
@@ -200,7 +209,7 @@ export FORCE_FIRMWARE=1
 # Use this to force copying the files instead of symlinking or hardlinking
 # them. This is useful if your destination directories are on a different
 # partition than your source files.
-# export COPYLINK=1
+export COPYLINK=1
 
 # Choose the checksum algorithm used in jigdo and template
 # files. Older jigdo tools can only support md5; but we want to move
@@ -209,7 +218,8 @@ export FORCE_FIRMWARE=1
 export JIGDO_CHECKSUM="md5"
 
 # Options
-# export MKISOFS=mkisofs
+export MKISOFS=xorriso
+export MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1 --protective-msdos-label"
 # export MKISOFS_OPTS="-r"		#For normal users
 # export MKISOFS_OPTS="-r -F ."	#For symlink farmers
 
@@ -400,6 +410,7 @@ export SNAPURL=Debian=https://snapshot.debian.org/archive/debian/SNAPDATETIME/
 # are comments.  The package order is important, as the packages will
 # be installed in the given order.
 #export BASE_INCLUDE="$BASEDIR"/data/$CODENAME/base_include
+export BASE_INCLUDE="$BASEDIR"/tasks/$CODENAME/include
 
 # File with list of packages to exclude as above.
 #export BASE_EXCLUDE="$BASEDIR"/data/$CODENAME/base_exclude
@@ -429,7 +440,7 @@ export SNAPURL=Debian=https://snapshot.debian.org/archive/debian/SNAPDATETIME/
 
 # Set to 1 to save space by omitting the installation manual. 
 # If so the README will link to the manual on the web site.
-#export OMIT_MANUAL=1
+export OMIT_MANUAL=1
 
 # Set to 1 to save space by omitting the release notes
 # If so we will link to them on the web site.
diff --git a/Makefile b/Makefile
index d55afc69..84229212 100755
--- a/Makefile
+++ b/Makefile
@@ -404,17 +404,18 @@ $(BDIR)/rawlist:
 	$(Q)if [ "$(SOURCEONLY)"x != "yes"x ] ; then \
 		if [ _$(INSTALLER_CD) != _1 ]; then \
 			for ARCH in $(ARCHES_NOSRC); do \
-				BINCLUDE=`[ -n "$(BASE_INCLUDE)" ] && cat $(BASE_INCLUDE) | sort -u | tr "\n" "," | sed 's!,$$!!g'`; \
+				BINCLUDE=`[ -n "$(BASE_INCLUDE)" ] && cat $(BASE_INCLUDE) | grep -v ^# | sort -u | tr "\n" "," | sed 's!,$$!!g'`; \
 				[ -z "$$BINCLUDE" ] || BINCLUDE="--include=$$BINCLUDE"; \
-				BEXCLUDE=`[ -n "$(BASE_EXCLUDE)" ] && cat $(BASE_EXCLUDE) | tr "\n" "," | sed 's!,$$!!g'`; \
+				BEXCLUDE=`[ -n "$(BASE_EXCLUDE)" ] && cat $(BASE_EXCLUDE) | grep -v ^# | tr "\n" "," | sed 's!,$$!!g'`; \
 				[ -z "$$BEXCLUDE" ] || BEXCLUDE="--exclude=$$BEXCLUDE"; \
-				debootstrap $(DEBOOTSTRAP_OPTS) --arch $$ARCH \
+				/home/sthibault/bin/debootstrap $(DEBOOTSTRAP_OPTS) --arch $$ARCH \
 				            --print-debs \
+					    --extra-suites=unreleased \
 				            $$BINCLUDE $$BEXCLUDE \
 				            $(CODENAME) \
 				            $(TDIR)/debootstrap.tmp \
 				            file:$(MIRROR) \
-			                $(DEBOOTSTRAP_SCRIPT) 2>/dev/null \
+			                $(DEBOOTSTRAP_SCRIPT) 2> /home/sthibault/tmp/sid/debootstrap.log \
 				    | tr ' ' '\n' > $(BDIR)/debootstrap-list; \
 				cat $(BDIR)/debootstrap-list >>$(BDIR)/rawlist; \
 				rm -rf $(TDIR)/debootstrap.tmp; \
diff --git a/data/bookworm/README.html.in b/data/bookworm/README.html.in
index 47a6e01e..d17306bc 100644
--- a/data/bookworm/README.html.in
+++ b/data/bookworm/README.html.in
@@ -101,6 +101,7 @@
 #endif
     <ul class="toc">
       <li><a href="#introduction">Introduction</a></li>
+      <li><a href="#hurd">Important note</a></li>
       <li><a href="#thisdisc">About This Disc</a></li>
       <li><a href="#install">Installing</a></li>
       <li><a href="#lastmin">Last-Minute Notes</a></li>
@@ -123,15 +124,17 @@
     computer, which does all the basic housekeeping and lets you start
     other programs. Debian is kernel independent. It currently uses
     either the <a href= "https://www.linux.org/">Linux</a>
-    or <a href="https://www.freebsd.org/">FreeBSD</a> kernel. Most of
+    or <a href="https://www.freebsd.org/">FreeBSD</a> kernel.
+    Debian GNU/Hurd replaces these kernels with the Mach micro-kernel and
+    the Hurd translators which provide the kernel features (network stack,
+    filesystem, etc.)
+    Most of
     the basic operating system tools come from the <a href=
     "https://www.gnu.org/">GNU project</a>; hence the name
     DEBIAN_KERNEL.</p>
 
-    <p>Debian is available for various kinds of computers
-    (&ldquo;architectures&rdquo;). Check the
-    <a href="https://www.debian.org/ports">ports</a> page for more
-    information.</p>
+    <p>Debian GNU/Hurd is available for
+    &ldquo;IBM-compatible&rdquo; PCs (<em>i386</em>) only.</p>
 
 #if OUTPUTtext
     <p>Read more at:<br />&nbsp;</br />
@@ -141,6 +144,19 @@
     <p><a href="https://www.debian.org/intro/about">Read more...</a></p>
 #endif
 
+    <h2 id="hurd">
+      Important note
+#ifdef OUTPUTtext
+<br />==============
+#endif
+    </h2>
+
+    <p>GNU/Hurd is not GNU/Linux! Please make sure to read the configuration
+    documentation on http://www.debian.org/ports/hurd/hurd-install as well
+    as the FAQ: http://www.gnu.org/software/hurd/faq.html (or its latest
+    version on http://darnassus.sceen.net/~hurd-web/faq/)
+    </p>
+
     <h2 id="thisdisc">
       About This Disc
 #ifdef OUTPUTtext
diff --git a/debian/changelog b/debian/changelog
index 2e5f834e..4c0d670e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -392,6 +392,10 @@ debian-cd (3.1.31) unstable; urgency=medium
 
 debian-cd (3.1.30) unstable; urgency=medium
 
+  [ Samuel Thibault ]
+  * Make tools/start_new_disc also cleanup SHA512 checksums.
+  * start_new_disc: Factorize code.
+
   [ Steve McIntyre ]
   * tools/update_popcon: cope with lower-case HTTP headers too; recently
     Debian enabled http2 so this broke.
diff --git a/easy-build.sh b/easy-build.sh
index 5b2909f3..8965226f 100755
--- a/easy-build.sh
+++ b/easy-build.sh
@@ -72,10 +72,11 @@ fi
 ## For what release to build images
 
 # The suite the installed system will be based on
-export CODENAME=bookworm
+# Keep it sid, even for the release
+export CODENAME=sid
 # The suite from which the udebs for the installer will be taken (normally
 # the same as CODENAME)
-export DI_CODENAME=bookworm
+export DI_CODENAME=sid
 
 
 ## The debian-installer images to use. This must match the suite (DI_CODENAME)
@@ -139,6 +140,7 @@ case $DISKTYPE in
 	;;
     DVD)
 	export INSTALLER_CD=3
+	export CUSTOMSIZE=1800
 	[ -z "$MAX_DVDS" ] || export MAXCDS=$MAX_DVDS
 	;;
     *)
diff --git a/tasks/forky/include b/tasks/forky/include
new file mode 100644
index 00000000..0f0c38e2
--- /dev/null
+++ b/tasks/forky/include
@@ -0,0 +1,30 @@
+netdde
+ntpdate
+debian-ports-archive-keyring
+hurd-recommended
+inetutils-ping
+inetutils-tools
+dash
+pciutils
+libpci3
+libpciaccess0
+inetutils-syslogd
+# rsyslog
+apt-utils
+isc-dhcp-client
+
+gdb
+
+vim
+emacs
+libp11-kit0
+
+dbus-x11
+
+#usr-is-merged
+
+#bind9-libs
+#bind9-dnsutils
+
+# to fill cron-daemon-common's dependency on systemd-sysusers
+opensysusers
diff --git a/tools/apt-selection b/tools/apt-selection
index 2b19c1f1..fcca6b1d 100755
--- a/tools/apt-selection
+++ b/tools/apt-selection
@@ -40,6 +40,7 @@ options=" -q -o Dir::State::status=$APTTMP/$THIS_PKGSET/status \
 		  -o Dir::State=$APTTMP/$THIS_PKGSET/apt-state/ \
 		  -o Dir::Cache=$APTTMP/$THIS_PKGSET/apt-cache/ \
 		  -o Dir::Etc=$APTTMP/$THIS_PKGSET/apt/ \
+		  -o Acquire::AllowInsecureRepositories=true \
 		  -o APT::Cache::AllVersions=$ALLVERSIONS \
 		  -o APT::Cache::ShowVersion=1 \
 		  -o APT::Architecture=$ARCH \
diff --git a/tools/make_disc_trees.pl b/tools/make_disc_trees.pl
index 467b3bff..b2367f2b 100755
--- a/tools/make_disc_trees.pl
+++ b/tools/make_disc_trees.pl
@@ -873,8 +873,8 @@ sub get_disc_size {
         $maxdiskblocks = int(737 * $MB / $blocksize) - $reserved;
         $diskdesc = "700MiB CD";
     } elsif ($chosen_disk eq "DVD") {
-        $maxdiskblocks = int(4700 * $MB / $blocksize) - $reserved;
-        $diskdesc = "4.7GB DVD";
+        $maxdiskblocks = int(1800 * $MB / $blocksize) - $reserved;
+        $diskdesc = "1.8GB DVD";
     } elsif ($chosen_disk eq "DLDVD") {
         $maxdiskblocks = int(8500 * $MB / $blocksize) - $reserved;
         $diskdesc = "8.5GB DVD";
diff --git a/tools/start_new_disc b/tools/start_new_disc
index ab6a3ef7..0273b8a5 100755
--- a/tools/start_new_disc
+++ b/tools/start_new_disc
@@ -350,156 +350,92 @@ if [ -n "$LOCAL" ] ; then
     SECTIONS="$SECTIONS local"
 fi
 
-# these two lines can be inserted below the "Architectures" line below,
-# to sort out broken Release files just after the testing --> stable
-# transition
-#     sed -e "s/^Suite: .*$/Suite: stable/" | \
-#     sed -e "s/^Description: .*$/Description: Debian $DEBVERSION/" | \
-
-if [ -e "$MIRROR/dists/$CODENAME/Release" ] ; then
-    # Strip the MD5Sum and SHA1 fields
-    # Update some other information as well
-    sed -e "s/^Architectures: .*$/Architectures: $ARCHES/" \
-        $MIRROR/dists/$CODENAME/Release | \
-        sed -e "s|^Components: .*$|Components: $SECTIONS|" | \
-        perl -ne 'if (/^(MD5Sum|SHA1|SHA256|SHA512):/i) { $f=1; next }
-    if ($f) { 
-        unless (/^ /) { print; $f=0 }
-    } else { print }' > dists/$CODENAME/Release
-    if [ "$EARLY_BUILD_HACK"x = "1"x ] ; then
-        RDATE=`awk '/^Date:/ { print $2,$3,$4,$5}' dists/$CODENAME/Release`
-        sed -i -e "s/^Suite: .*$/Suite: stable/" dists/$CODENAME/Release
-        sed -i -e "s/^Description: .*$/Description: Debian $DEBVERSION Released $RDATE/" dists/$CODENAME/Release
-    fi
-
-    # Create the suite symlink
-    SUITE=$(sed -n "/^Suite:/ s/.*: //p" dists/$CODENAME/Release)
-    if [ -n "$SUITE" ] && [ x"$SUITE" != x"$CODENAME" ]; then
-        ln -sf $CODENAME dists/$SUITE
-    fi
-else
-    echo "ERROR: Release file ($MIRROR/dists/$CODENAME/Release) is missing !"
-    exit 1
-fi
-
-if [ "$BACKPORTS"x != ""x ]; then
-    if [ -e "$MIRROR/dists/$CODENAME-backports/Release" ] ; then
+start_new_release() {
+    DIST=$1
+    # these two lines can be inserted below the "Architectures" line below,
+    # to sort out broken Release files just after the testing --> stable
+    # transition
+    #     sed -e "s/^Suite: .*$/Suite: stable/" | \
+    #     sed -e "s/^Description: .*$/Description: Debian $DEBVERSION/" | \
+
+    if [ -e "$MIRROR/dists/$DIST/Release" ] ; then
 	# Strip the MD5Sum and SHA1 fields
 	# Update some other information as well
 	sed -e "s/^Architectures: .*$/Architectures: $ARCHES/" \
-            $MIRROR/dists/$CODENAME-backports/Release | \
-            sed -e "s|^Components: .*$|Components: $SECTIONS|" | \
-            perl -ne 'if (/^(MD5Sum|SHA1|SHA256|SHA512):/i) { $f=1; next }
-    if ($f) { 
-        unless (/^ /) { print; $f=0 }
-    } else { print }' > dists/$CODENAME-backports/Release
+	    $MIRROR/dists/$DIST/Release | \
+	    sed -e "s|^Components: .*$|Components: $SECTIONS|" | \
+	    perl -ne 'if (/^(MD5Sum|SHA1|SHA256|SHA512):/i) { $f=1; next }
+	if ($f) { 
+	    unless (/^ /) { print; $f=0 }
+	} else { print }' > dists/$DIST/Release
 	if [ "$EARLY_BUILD_HACK"x = "1"x ] ; then
-            RDATE=`awk '/^Date:/ { print $2,$3,$4,$5}' dists/$CODENAME-backports/Release`
-            sed -i -e "s/^Suite: .*$/Suite: stable/" dists/$CODENAME-backports/Release
-            sed -i -e "s/^Description: .*$/Description: Debian $DEBVERSION Released $RDATE/" dists/$CODENAME-backports/Release
+	    RDATE=`awk '/^Date:/ { print $2,$3,$4,$5}' dists/$DIST/Release`
+	    sed -i -e "s/^Suite: .*$/Suite: stable/" dists/$DIST/Release
+	    sed -i -e "s/^Description: .*$/Description: Debian $DEBVERSION Released $RDATE/" dists/$DIST/Release
 	fi
 
 	# Create the suite symlink
-	SUITE=$(sed -n "/^Suite:/ s/.*: //p" dists/$CODENAME-backports/Release)
-	if [ -n "$SUITE" ] && [ x"$SUITE" != x"$CODENAME-backports" ]; then
-            ln -sf $CODENAME-backports dists/$SUITE
+	SUITE=$(sed -n "/^Suite:/ s/.*: //p" dists/$DIST/Release)
+	if [ -n "$SUITE" ] && [ x"$SUITE" != x"$DIST" ]; then
+	    ln -sf $DIST dists/$SUITE
 	fi
     else
-	echo "ERROR: Release file ($MIRROR/dists/$CODENAME-backports/Release) is missing !"
+	echo "ERROR: Release file ($MIRROR/dists/$DIST/Release) is missing !"
 	exit 1
     fi
-fi
 
-# Copying individual release files
-for ARCH in $ARCHES
-do
-    for SECT in $SECTIONS
-    do
-        # Install the release files
-        if [ -e "$MIRROR/dists/$CODENAME/$SECT/binary-$ARCH/Release" ] ; then
-            mkdir -p dists/$CODENAME/$SECT/binary-$ARCH
-            cp $MIRROR/dists/$CODENAME/$SECT/binary-$ARCH/Release \
-                dists/$CODENAME/$SECT/binary-$ARCH/
-            if [ "$DEBVERSION" != "testing" ] ; then
-                sed -i "s/^Archive:.*$/Archive: stable/" dists/$CODENAME/$SECT/binary-$ARCH/Release
-            fi
-        fi
-        if [ -n "$NONUS" -a -e "$NONUS/dists/$CODENAME/non-US/$SECT/binary-$ARCH/Release" ] ; then
-            mkdir -p dists/$CODENAME/non-US/$SECT/binary-$ARCH
-            cp $NONUS/dists/$CODENAME/non-US/$SECT/binary-$ARCH/Release \
-                dists/$CODENAME/non-US/$SECT/binary-$ARCH/
-            if [ "$DEBVERSION" != "testing" ] ; then
-                sed -i "s/^Archive:.*$/Archive: stable/" dists/$CODENAME/non-US/$SECT/binary-$ARCH/Release
-            fi
-        fi
-    done
-
-    if [ -n "$LOCALDEBS" -a -n "$LOCAL" ] ; then
-        if [ -e $LOCALDEBS/dists/$CODENAME/local/binary-$ARCH/Release ] ; then
-            mkdir -p dists/$CODENAME/local/binary-$ARCH
-            cp $LOCALDEBS/dists/$CODENAME/local/binary-$ARCH/Release \
-                dists/$CODENAME/local/binary-$ARCH/
-        fi
-    fi
-
-    if [ -e "$MIRROR/dists/$DI_CODENAME/main/debian-installer/binary-$ARCH/Release" ] ; then
-        mkdir -p dists/$CODENAME/main/debian-installer/binary-$ARCH
-        cp $MIRROR/dists/$DI_CODENAME/main/debian-installer/binary-$ARCH/Release \
-            dists/$CODENAME/main/debian-installer/binary-$ARCH/
-        if [ "$DEBVERSION" != "testing" ] ; then
-            sed -i "s/^Archive:.*$/Archive: stable/" dists/$CODENAME/main/debian-installer/binary-$ARCH/Release
-        fi
-    fi
-
-    if [ -n "$LOCAL"  -a -e "${LOCALDEBS:-$MIRROR}/dists/$DI_CODENAME/local/debian-installer/binary-$ARCH/Release" ] ; then
-        mkdir -p dists/$CODENAME/local/debian-installer/binary-$ARCH
-        cp "${LOCALDEBS:-$MIRROR}/dists/$DI_CODENAME/local/debian-installer/binary-$ARCH/Release" \
-            dists/$CODENAME/local/debian-installer/binary-$ARCH/
-    fi
-done
-
-# Copying individual release files for backports
-if [ "$BACKPORTS"x != ""x ]; then
     for ARCH in $ARCHES
     do
 	for SECT in $SECTIONS
 	do
-            # Install the release files
-            if [ -e "$MIRROR/dists/$CODENAME-backports/$SECT/binary-$ARCH/Release" ] ; then
-		mkdir -p dists/$CODENAME-backports/$SECT/binary-$ARCH
-		cp $MIRROR/dists/$CODENAME-backports/$SECT/binary-$ARCH/Release \
-                   dists/$CODENAME-backports/$SECT/binary-$ARCH/
+	    # Install the release files
+	    if [ -e "$MIRROR/dists/$DIST/$SECT/binary-$ARCH/Release" ] ; then
+		mkdir -p dists/$DIST/$SECT/binary-$ARCH
+		cp $MIRROR/dists/$DIST/$SECT/binary-$ARCH/Release \
+		    dists/$DIST/$SECT/binary-$ARCH/
 		if [ "$DEBVERSION" != "testing" ] ; then
-                    sed -i "s/^Archive:.*$/Archive: stable/" dists/$CODENAME-backports/$SECT/binary-$ARCH/Release
+		    sed -i "s/^Archive:.*$/Archive: stable/" dists/$DIST/$SECT/binary-$ARCH/Release
 		fi
-            fi
-            if [ -n "$NONUS" -a -e "$NONUS/dists/$CODENAME-backports/non-US/$SECT/binary-$ARCH/Release" ] ; then
-		mkdir -p dists/$CODENAME-backports/non-US/$SECT/binary-$ARCH
-		cp $NONUS/dists/$CODENAME-backports/non-US/$SECT/binary-$ARCH/Release \
-                   dists/$CODENAME-backports/non-US/$SECT/binary-$ARCH/
+	    fi
+	    if [ -n "$NONUS" -a -e "$NONUS/dists/$DIST/non-US/$SECT/binary-$ARCH/Release" ] ; then
+		mkdir -p dists/$DIST/non-US/$SECT/binary-$ARCH
+		cp $NONUS/dists/$DIST/non-US/$SECT/binary-$ARCH/Release \
+		    dists/$DIST/non-US/$SECT/binary-$ARCH/
 		if [ "$DEBVERSION" != "testing" ] ; then
-                    sed -i "s/^Archive:.*$/Archive: stable/" dists/$CODENAME-backports/non-US/$SECT/binary-$ARCH/Release
+		    sed -i "s/^Archive:.*$/Archive: stable/" dists/$DIST/non-US/$SECT/binary-$ARCH/Release
 		fi
-            fi
+	    fi
 	done
 
 	if [ -n "$LOCALDEBS" -a -n "$LOCAL" ] ; then
-            if [ -e $LOCALDEBS/dists/$CODENAME-backports/local/binary-$ARCH/Release ] ; then
-		mkdir -p dists/$CODENAME-backports/local/binary-$ARCH
-		cp $LOCALDEBS/dists/$CODENAME-backports/local/binary-$ARCH/Release \
-                   dists/$CODENAME-backports/local/binary-$ARCH/
-            fi
+	    if [ -e $LOCALDEBS/dists/$DIST/local/binary-$ARCH/Release ] ; then
+		mkdir -p dists/$DIST/local/binary-$ARCH
+		cp $LOCALDEBS/dists/$DIST/local/binary-$ARCH/Release \
+		    dists/$DIST/local/binary-$ARCH/
+	    fi
 	fi
 
 	if [ -e "$MIRROR/dists/$DI_CODENAME/main/debian-installer/binary-$ARCH/Release" ] ; then
-            mkdir -p dists/$CODENAME-backports/main/debian-installer/binary-$ARCH
-            cp $MIRROR/dists/$DI_CODENAME/main/debian-installer/binary-$ARCH/Release \
-               dists/$CODENAME-backports/main/debian-installer/binary-$ARCH/
-            if [ "$DEBVERSION" != "testing" ] ; then
-		sed -i "s/^Archive:.*$/Archive: stable/" dists/$CODENAME-backports/main/debian-installer/binary-$ARCH/Release
-            fi
+	    mkdir -p dists/$DIST/main/debian-installer/binary-$ARCH
+	    cp $MIRROR/dists/$DI_CODENAME/main/debian-installer/binary-$ARCH/Release \
+		dists/$DIST/main/debian-installer/binary-$ARCH/
+	    if [ "$DEBVERSION" != "testing" ] ; then
+		sed -i "s/^Archive:.*$/Archive: stable/" dists/$DIST/main/debian-installer/binary-$ARCH/Release
+	    fi
+	fi
+
+	if [ -n "$LOCAL"  -a -e "${LOCALDEBS:-$MIRROR}/dists/$DI_CODENAME/local/debian-installer/binary-$ARCH/Release" ] ; then
+	    mkdir -p dists/$CODENAME/local/debian-installer/binary-$ARCH
+	    cp "${LOCALDEBS:-$MIRROR}/dists/$DI_CODENAME/local/debian-installer/binary-$ARCH/Release" \
+		dists/$CODENAME/local/debian-installer/binary-$ARCH/
 	fi
     done
+}
+
+start_new_release $CODENAME
+
+if [ "$BACKPORTS"x != ""x ]; then
+    start_new_release $CODENAME-backports
 fi
 
 # Upgrade packages / kernels
diff --git a/update-cd b/update-cd
index 060d3293..797715fe 100755
--- a/update-cd
+++ b/update-cd
@@ -71,7 +71,7 @@ DIFF=/home/debian-cd/lists/bookworm/r0-r1.diff
 if [ "$TYPE" = "cd" ] ; then
     CDSIZE=644 # megabytes, leaving space for metadata
 else
-    CDSIZE=4300 # megabytes, leaving space for metadata
+    CDSIZE=1800 # megabytes, leaving space for metadata
 fi
 
 CLOG=dists/$CODENAME/ChangeLog