diff --git a/debian/changelog b/debian/changelog
index 783a770c..070d76b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.544) UNRELEASED; urgency=medium
+
+  * Properly fix the hard-linking of vmlinuz, taken astray by my misguided
+    merge review.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 02 Nov 2018 14:46:30 -0700
+
 livecd-rootfs (2.543) disco; urgency=medium
 
   [ Cody Shepherd ]
diff --git a/live-build/auto/build b/live-build/auto/build
index ba06b072..eb83f8d8 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -849,13 +849,13 @@ done
 NUMFLAVOURS="$(set -- $LB_LINUX_FLAVOURS; echo $#)"
 if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
 	# only one kernel flavour
-	if [ -f "binary/$INITFS/vmlinuz" ]; then
+	if [ -f "binary/$INITFS/vmlinuz" ] && ! [ -h "binary/$INITFS/vmlinuz" ]; then
 		ln "binary/$INITFS/vmlinuz" "$PREFIX.kernel"
 		chmod 644 "$PREFIX.kernel"
 	else
 		ln -sf "$PREFIX.kernel-$LB_LINUX_FLAVOURS" "$PREFIX.kernel"
 	fi
-	if [ -f "binary/$INITFS/initrd.lz" ]; then
+	if [ -f "binary/$INITFS/initrd.lz" ] && ! [ -h "binary/$INITFS/initrd.lz" ]; then
 		ln "binary/$INITFS/initrd.lz" "$PREFIX.initrd"
 		chmod 644 "$PREFIX.initrd"
 	else