diff --git a/ChangeLog b/ChangeLog
index fa8684862..d94b30b1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-23  Josh Triplett <josh@joshtriplett.org>
+
+	* grub-core/boot/i386/pc/lnxboot.S: Re-add support for recording the
+	boot partition.
+
 2013-09-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* Makefile.util.def (libgrubmods.a): Remove CFLAGS_POSIX as this lib
diff --git a/grub-core/boot/i386/pc/lnxboot.S b/grub-core/boot/i386/pc/lnxboot.S
index e4bc8b425..87e56a2fd 100644
--- a/grub-core/boot/i386/pc/lnxboot.S
+++ b/grub-core/boot/i386/pc/lnxboot.S
@@ -207,6 +207,10 @@ real_code_2:
 2:
 	call	LOCAL(move_memory)
 
+	movb	%dh, %ss:(DATA_ADDR + GRUB_DECOMPRESSOR_I386_PC_BOOT_DEVICE + 2)
+	movb	(reg_edx + 2 - start), %dh
+	movb	%dh, %ss:(DATA_ADDR + GRUB_DECOMPRESSOR_I386_PC_BOOT_DEVICE + 1)
+
 	movb	$0xFF, %dh
 
 	ljmp	$(DATA_ADDR >> 4), $0