diff --git a/debian/changelog b/debian/changelog
index 38781f8c..24f60767 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ debian-cd (2.2.26) UNRELEASED; urgency=low
     the archive.
   * Deal with new xfce-desktop task.
 
+  [ Steve McIntyre ]
+  * Merge patch from Petter to allow override of the default boot choice
+    in syslinux using the ISOLINUX_DEFAULT config option. Closes: #393229
+	
  -- Joey Hess <joeyh@debian.org>  Tue, 17 Oct 2006 14:59:53 -0400
 
 debian-cd (2.2.25) unstable; urgency=low
diff --git a/tools/boot/etch/boot-amd64 b/tools/boot/etch/boot-amd64
index d5d35945..9db38961 100755
--- a/tools/boot/etch/boot-amd64
+++ b/tools/boot/etch/boot-amd64
@@ -131,6 +131,10 @@ if [ -n "$KERNEL_PARAMS" ]; then
 	sed -i "s|append |append $KERNEL_PARAMS |" boot$N/isolinux/isolinux.cfg
 fi
 
+if [ -n "$ISOLINUX_DEFAULT" ]; then
+    sed -i "s/^DEFAULT .*$/DEFAULT $ISOLINUX_DEFAULT/" boot$N/isolinux/isolinux.cfg
+fi
+
 # Add autorun if we have README.html
 
 if [ -f $CDDIR/README.html ]; then
diff --git a/tools/boot/etch/boot-i386 b/tools/boot/etch/boot-i386
index 8f34b4ca..79ced3a2 100755
--- a/tools/boot/etch/boot-i386
+++ b/tools/boot/etch/boot-i386
@@ -193,6 +193,10 @@ if [ "$NN" = "1" ]; then
 		# file.
 		sed -i "s|append |append $KERNEL_PARAMS |" boot$N/isolinux/isolinux.cfg
 	fi
+
+    if [ -n "$ISOLINUX_DEFAULT" ]; then
+        sed -i "s/^DEFAULT .*$/DEFAULT $ISOLINUX_DEFAULT/" boot$N/isolinux/isolinux.cfg
+    fi
 fi
 
 # Add autorun if we have README.html