diff --git a/debian/changelog b/debian/changelog
index 6e199630..f96da1e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,9 @@ debian-cd (3.1.12) UNRELEASED; urgency=low
   * Make sure the DEBIAN_KERNEL placeholder in README.* is replaced;
     switch from cpp to sed for that so it works inside quoted
     text. Closes: #699198
+  * Deal with syslinux version 5.x needing to install more files for
+    bootable x86 media. Thanks to Daniel Baumann for the path.
+    Closes: #699884
 
  -- Steve McIntyre <93sam@debian.org>  Wed, 26 Sep 2012 01:09:13 +0100
 
diff --git a/tools/boot/wheezy/boot-x86 b/tools/boot/wheezy/boot-x86
index 0acd4f3c..f8410b17 100644
--- a/tools/boot/wheezy/boot-x86
+++ b/tools/boot/wheezy/boot-x86
@@ -274,6 +274,11 @@ fi
 
 cp -f $CDDIR/../syslinux/usr/lib/syslinux/isolinux.bin boot$N/isolinux/
 cp -f $CDDIR/../syslinux/usr/lib/syslinux/vesamenu.c32 boot$N/isolinux/
+if [ -e $CDDIR/../syslinux/usr/lib/syslinux/ldlinux.c32 ]; then
+	cp -f $CDDIR/../syslinux/usr/lib/syslinux/ldlinux.c32 boot$N/isolinux/
+	cp -f $CDDIR/../syslinux/usr/lib/syslinux/libcom32.c32 boot$N/isolinux/
+	cp -f $CDDIR/../syslinux/usr/lib/syslinux/libutil.c32 boot$N/isolinux/
+fi
 
 if [ -z "$MULTIARCH" ]; then
 	# Set up isolinux dir for only the current arch