diff -Nru live-build-3.0~a24/debian/changelog live-build-3.0~a24/debian/changelog
--- live-build-3.0~a24/debian/changelog	2012-03-20 16:07:54.000000000 +0000
+++ live-build-3.0~a24/debian/changelog	2012-04-18 12:10:05.000000000 +0000
@@ -1,3 +1,12 @@
+live-build (3.0~a24-1ubuntu30) precise; urgency=low
+
+  * ubuntu-kernel-img-conf.patch: On some architectures (notably powerpc),
+    create /etc/kernel-img.conf with the default contents plus 'link_on_boot
+    yes'.  This matches the behaviour of base-installer/library.sh more
+    closely (LP: #958839).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 18 Apr 2012 13:10:04 +0100
+
 live-build (3.0~a24-1ubuntu29) precise; urgency=low
 
   * ubuntu-powerpc-smp.patch: Switch from powerpc to powerpc-smp kernel.
diff -Nru live-build-3.0~a24/debian/patches/series live-build-3.0~a24/debian/patches/series
--- live-build-3.0~a24/debian/patches/series	2012-03-20 16:05:38.000000000 +0000
+++ live-build-3.0~a24/debian/patches/series	2012-04-18 11:52:55.000000000 +0000
@@ -20,3 +20,4 @@
 ubuntu-resolvconf.patch
 examples-auto-config-typo.patch
 ubuntu-powerpc-smp.patch
+ubuntu-kernel-img-conf.patch
diff -Nru live-build-3.0~a24/debian/patches/ubuntu-kernel-img-conf.patch live-build-3.0~a24/debian/patches/ubuntu-kernel-img-conf.patch
--- live-build-3.0~a24/debian/patches/ubuntu-kernel-img-conf.patch	1970-01-01 00:00:00.000000000 +0000
+++ live-build-3.0~a24/debian/patches/ubuntu-kernel-img-conf.patch	2012-04-18 12:08:57.000000000 +0000
@@ -0,0 +1,32 @@
+Description: Put kernel symlinks in /boot on some architectures
+ This matches base-installer/library.sh more closely.
+Author: Colin Watson <cjwatson@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/958839
+Forwarded: no
+Last-Update: 2012-04-18
+
+Index: b/scripts/build/lb_chroot_linux-image
+===================================================================
+--- a/scripts/build/lb_chroot_linux-image
++++ b/scripts/build/lb_chroot_linux-image
+@@ -53,6 +53,20 @@
+ 		done
+ 	done
+ 
++	case "${LB_ARCHITECTURES}" in
++		alpha|amd64|hppa|i386|ia64|m68k|mips|mipsel)
++			;;
++
++		*)
++			cat > chroot/etc/kernel-img.conf << EOF
++# Kernel Image management overrides
++# See kernel-img.conf(5) for details
++do_symlinks = yes
++link_in_boot = yes
++EOF
++			;;
++	esac
++
+ 	# Creating stage file
+ 	Create_stagefile .stage/chroot_linux-image
+ fi