diff --git a/ChangeLog b/ChangeLog
index 9be018fa8..825a2b3a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-09-12  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
+
+	* stage2/boot.c (load_image): Use CURRENT_DRIVE and
+	CURRENT_PARTITION instead of SAVED_DRIVE and SAVED_PARTITION for
+	the boot device in the Multiboot information. Reported by
+	Stephen Early <steve@greenend.org.uk>.
+	
 1999-09-12  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
 
 	* stage2/disk_io.c (sane_partition) [STAGE1_5]: Defined.
diff --git a/THANKS b/THANKS
index 05c979896..421ef6898 100644
--- a/THANKS
+++ b/THANKS
@@ -24,5 +24,6 @@ OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
 Pavel Roskin <pavel_roskin@geocities.com>
 Peter Astrand <altic@lysator.liu.se>
 Ramon van Handel <vhandel@chem.vu.nl>
+Stephen Early <steve@greenend.org.uk>
 Takehiro Suzuki <takehiro@coral.ocn.ne.jp>
 VaX#n8 <vax@linkdead.paranoia.com>
diff --git a/stage2/boot.c b/stage2/boot.c
index f51966490..709bcfeb0 100644
--- a/stage2/boot.c
+++ b/stage2/boot.c
@@ -295,7 +295,7 @@ load_image (char *kernel, char *arg)
   mbi.cmdline = (int) arg;
   mbi.mods_count = 0;
   mbi.mods_addr = 0;
-  mbi.boot_device = (saved_drive << 24) | saved_partition;
+  mbi.boot_device = (current_drive << 24) | current_partition;
   mbi.flags &= ~(MB_INFO_MODS | MB_INFO_AOUT_SYMS | MB_INFO_ELF_SHDR);
   mbi.syms.a.tabsize = 0;
   mbi.syms.a.strsize = 0;