diff --git a/debian/changelog b/debian/changelog
index 489cda02..d827c118 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ debian-cd (3.0.6) UNRELEASED; urgency=low
 
   [ Raphael Hertzog ]
   * Don't try to copy sbm on etch CD images as it got removed.
+  * Also extract isolinux.bin from the syslinux package in the case of etch
+    CD images (since it's no more provided by debian-cd itself). 
 
  -- Frans Pop <fjp@debian.org>  Sun, 02 Nov 2008 00:03:00 +0100
 
diff --git a/tools/boot/etch/boot-amd64 b/tools/boot/etch/boot-amd64
index 951fe7f8..9997eed5 100755
--- a/tools/boot/etch/boot-amd64
+++ b/tools/boot/etch/boot-amd64
@@ -115,7 +115,10 @@ rm -f boot$N/isolinux-amd64/isolinux.cfg.with* 2>/dev/null || true
 
 sed -i "s|/install/|/install.amd/|" boot$N/isolinux-amd64/isolinux.cfg
 
-cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/isolinux/
+mkdir -p $CDDIR/../syslinux
+SYSLINUXDEB=`$BASEDIR/tools/which_deb $MIRROR $DI_CODENAME syslinux`
+ar p "${SYSLINUXDEB}" data.tar.gz | tar zxf - -C $CDDIR/../syslinux ./usr/lib
+cp -f $CDDIR/../syslinux/usr/lib/syslinux/isolinux.bin boot$N/isolinux/
 
 if [ -n "$KERNEL_PARAMS" ]; then
     # Substitute custom kernel params into the isolinux config
diff --git a/tools/boot/etch/boot-i386 b/tools/boot/etch/boot-i386
index ae114f46..8a7af057 100755
--- a/tools/boot/etch/boot-i386
+++ b/tools/boot/etch/boot-i386
@@ -213,7 +213,10 @@ if [ "$NN" = "1" ]; then
 	    rm -rf boot$N/isolinux-amd64
 	fi
 
-    cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/isolinux/
+	mkdir -p $CDDIR/../syslinux
+	SYSLINUXDEB=`$BASEDIR/tools/which_deb $MIRROR $DI_CODENAME syslinux`
+	ar p "${SYSLINUXDEB}" data.tar.gz | tar zxf - -C $CDDIR/../syslinux ./usr/lib
+	cp -f $CDDIR/../syslinux/usr/lib/syslinux/isolinux.bin boot$N/isolinux/
 
 	if [ -n "$KERNEL_PARAMS" ]; then
 		# Substitute custom kernel params into the isolinux config