diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
index 8314f26d..3ee40014 100644
--- a/src/arch/i386/Makefile
+++ b/src/arch/i386/Makefile
@@ -74,8 +74,11 @@ CFLAGS			+= -Ui386
 ISOLINUX_BIN_LIST	:= \
 	$(ISOLINUX_BIN) \
 	/usr/lib/syslinux/isolinux.bin \
+	/usr/lib/syslinux/bios/isolinux.bin \
 	/usr/share/syslinux/isolinux.bin \
-	/usr/local/share/syslinux/isolinux.bin
+	/usr/share/syslinux/bios/isolinux.bin \
+	/usr/local/share/syslinux/isolinux.bin \
+	/usr/local/share/syslinux/bios/isolinux.bin
 ISOLINUX_BIN	= $(firstword $(wildcard $(ISOLINUX_BIN_LIST)))
 
 # i386-specific directories containing source files
diff --git a/src/util/geniso b/src/util/geniso
index 48ea2f2a..4dc72192 100755
--- a/src/util/geniso
+++ b/src/util/geniso
@@ -38,6 +38,14 @@ shift
 dir=`mktemp -d bin/iso.dir.XXXXXX`
 cfg=$dir/isolinux.cfg
 cp -p $isolinux_bin $dir
+
+# syslinux 6.x needs a file called ldlinux.c32
+ldlinux_c32=$(dirname ${isolinux_bin})/ldlinux.c32
+if [ -s ${ldlinux_c32} ]
+then
+	cp -p ${ldlinux_c32} ${dir}
+fi
+
 cat > $cfg <<EOF
 # These default options can be changed in the geniso script
 SAY iPXE ISO boot image