diff --git a/debian/changelog b/debian/changelog
index dfa2f3d2..9a453548 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,10 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
     yet.
   * Fix autorun.inf generation when win32-loader is present.
 
+  [ Steve McIntyre ]
+  * Make daily i386/amd64 lenny builds work again - don't attempt to copy
+    the win32-loader files into place if they don't exist.
+
  -- Otavio Salvador <otavio@debian.org>  Thu, 13 Sep 2007 15:28:30 -0300
 
 debian-cd (3.0.3) unstable; urgency=low
diff --git a/tools/boot/lenny/boot-x86 b/tools/boot/lenny/boot-x86
index bfaa4608..238c15ea 100644
--- a/tools/boot/lenny/boot-x86
+++ b/tools/boot/lenny/boot-x86
@@ -172,8 +172,10 @@ if [ "$THISTYPE" = "isolinux" ]; then
 	# Isolinux setup including config and help files comes from d-i.
 	cat cdrom/debian-cd_info.tar.gz | (cd boot$N/$ISOLINUXDIR/; tar zx)
 	# Not everything in the tarball is isolinux stuff
-	mv boot$N/$ISOLINUXDIR/g2ldr* boot$N/$ISOLINUXDIR/setup.exe \
+	if [ -e boot$N/$ISOLINUXDIR/win32-loader.ini ] ; then
+	    mv boot$N/$ISOLINUXDIR/g2ldr* boot$N/$ISOLINUXDIR/setup.exe \
 		boot$N/$ISOLINUXDIR/win32-loader.ini boot$N/
+	fi
 	if [ -e boot$N/$ISOLINUXDIR/f3.txt.withgtk ]; then
 		extra_image gtk/initrd.gz
 		mv boot$N/$ISOLINUXDIR/f3.txt.withgtk boot$N/$ISOLINUXDIR/f3.txt