diff --git a/tools/boot/squeeze/boot-kfreebsd b/tools/boot/squeeze/boot-kfreebsd
index 6a402f24..2128ddc9 100644
--- a/tools/boot/squeeze/boot-kfreebsd
+++ b/tools/boot/squeeze/boot-kfreebsd
@@ -16,12 +16,16 @@ N=$1
 CDDIR=$2
 BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
-       DI_WWW_HOME="http://d-i.debian.org/daily-images/$ARCH/daily"
-       if [ -n "$DI_DIR" ];then
-               DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
-               DI_WWW_HOME=""
-               echo "Using images from $DI_DIR"
-       fi
+    if [ "$ARCH" = kfreebsd-i386 ]; then
+        DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-i386/daily"
+    else
+        DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-amd64/daily"
+    fi
+    if [ -n "$DI_DIR" ];then
+        DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+        DI_WWW_HOME=""
+        echo "Using images from $DI_DIR"
+    fi
 fi
 if [ ! "$DI_DIST" ]; then
        DI_DIST="$DI_CODENAME"
diff --git a/tools/boot/squeeze/boot-x86 b/tools/boot/squeeze/boot-x86
index eed7fcd4..3773de8d 100644
--- a/tools/boot/squeeze/boot-x86
+++ b/tools/boot/squeeze/boot-x86
@@ -235,8 +235,11 @@ if [ "$THISTYPE" = "isolinux" ]; then
 
 	# Not everything in the tarball is isolinux stuff
 	if [ -e boot$N/isolinux/win32-loader.ini ] ; then
-		mv boot$N/isolinux/g2ldr* boot$N/isolinux/setup.exe \
-			boot$N/isolinux/win32-loader.ini boot$N/
+		for file in boot$N/isolinux/g2ldr* boot$N/isolinux/setup.exe boot$N/isolinux/win32-loader.ini; do
+			if [ -e $file ] ; then
+				mv -v $file boot$N/
+			fi
+		done
 	fi
 
 	if [ -e boot$N/isolinux/f3.txt.withgtk ]; then