diff --git a/BUGS b/BUGS
index 4074391ee..8bae9eb33 100644
--- a/BUGS
+++ b/BUGS
@@ -10,7 +10,7 @@ Known problems/bugs:
   - Password feature in the config file is a bit primitive, and needs
     fleshing out/design work to make more intuitive.
 
-  - If an "uppermem=" command was used to tell GRUB it had a different
+  - If an "uppermem" command was used to tell GRUB it had a different
     amount of upper memory available, then the user escapes to the menu
     interface, the upper memory displayed there still says the amount
     set by the user instead of being reset to the default by the escape.
diff --git a/ChangeLog b/ChangeLog
index e84b72afa..c59a0b1a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-10-04  Pavel Roskin  <pavel_roskin@geocities.com>
+
+	* stage2/freebsd.h (struct bootinfo): New member, bi_bios_dev.
+	* stage2/boot.c (bsd_boot): Set BI.BI_BIOS_DEV to SAVED_DRIVE.
+	
 1999-10-04  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
 
 	From Pavel Roskin:
diff --git a/TODO b/TODO
index f1dd1f0e7..935fa970d 100644
--- a/TODO
+++ b/TODO
@@ -1,39 +1,41 @@
-Change partition syntax to correspond with BSD ``slice'' syntax
-(`(hd0,1a)' -> `/dev/hd0s2a').
+-*- Mode: Outline -*-
 
-Add a partition naming syntax that means ``the first partition of this
-type''.  We need this for clean Hurd install floppies.
+Before working on anything in this file, it's very important that you
+make contact with the core GRUB developers. Things herein might be
+slightly out of date or otherwise not easy to understand at first
+glance. So write to <bug-grub@gnu.org> first.
 
-Add a real scripting language, possibly retaining backward
-compatibility so that old config files can be used.
+Priorities:
+  Reported bugs generally have top priority.
+  Non-reported and non-encountered bugs (things we know don't work,
+    but don't really impede things) have lower priority.
+  Things in this file are ranked with one to three !; the more, the
+  higher priority.
 
-Add internationalization support, emulating gettext as much as is
-feasible.
-
-Add bootable CDROM support (this probably means we have to support
-ISO-9660 plus maybe even the Rock Ridge extensions...  ugh).
-
-Make symbolic links work for BSD FFS.
-
-Fix keyboard/gateA20 bug (????  at least look at the code).  The
-keyboard status bits may be checked wrong.
-
-Add indirect block support to the BSD FFS filesystem code, so files
-larger than 16MB can be read.
-
-???  Add command for modifying partition types.
-
-Add OpenBSD support. The recent versions cannot be loaded.
-
-Fix-up FreeBSD, NetBSD (and OpenBSD ?) command-line boot parameters
-
-Add a new installation command, such as `setup', which should be easier
-to use and more automatic than the command `install'.
-
-Add keyboard layout configuration support.
-
-Clean up and enhance the manuals, especially concept indexes.
-
-Add more filesystems support (XFS, NTFS, etc.)
-
-Add remote console support (serial, parallel and net).
+* Support partition syntax to correspond with BSD ``slice'' syntax
+  (`(hd0,1a)' -> `/dev/hd0s2a'). !
+? Add a partition naming syntax that means ``the first partition of
+  this type''.  We need this for clean Hurd install floppies.
+* Add a real scripting language, possibly retaining backward
+  compatibility so that old config files can be used.
+* Add internationalization support, emulating gettext as much as is
+  feasible.
+* Make symbolic links work for BSD FFS. !
+* Fix keyboard/gateA20 bug (????  at least look at the code). The
+  keyboard status bits may be checked wrong.
+* Add indirect block support to the BSD FFS filesystem code, so files
+  larger than 16MB can be read. !
+? Add command for modifying partition types.
+* Add OpenBSD support. The recent versions cannot be loaded. !!!
+* Fix-up FreeBSD, NetBSD (and OpenBSD ?) command-line boot
+  parameters. !!
+* Add a new installation command, such as `setup', which should be
+  easier to use and more automatic than the command `install'. !!!
+* Add keyboard layout configuration support. !
+* Clean up and enhance the manuals, especially concept indexes. !!!
+* Add more filesystems support (XFS, NTFS, etc.)
+* Add remote console support (serial, parallel and net).
+* Add RAID support.
+* Complete the netboot support. !
+* Support CHS and LBA in a single Stage 1. !!
+* Add automatic configuration support.
diff --git a/stage2/boot.c b/stage2/boot.c
index 7493a54c4..82b71b9cb 100644
--- a/stage2/boot.c
+++ b/stage2/boot.c
@@ -621,6 +621,7 @@ bsd_boot (kernel_t type, int bootdev, char *arg)
 
       bi.bi_size = sizeof (struct bootinfo);
       bi.bi_memsizes_valid = 1;
+      bi.bi_bios_dev = saved_drive;
       bi.bi_basemem = mbi.mem_lower;
       bi.bi_extmem = mbi.mem_upper;
 
diff --git a/stage2/freebsd.h b/stage2/freebsd.h
index 69fcbf6f4..c8b2242dc 100644
--- a/stage2/freebsd.h
+++ b/stage2/freebsd.h
@@ -83,7 +83,8 @@ struct bootinfo
     unsigned long bi_bios_geom[N_BIOS_GEOM];
     unsigned int bi_size;
     unsigned char bi_memsizes_valid;
-    unsigned char bi_pad[3];
+    unsigned char bi_bios_dev;
+    unsigned char bi_pad[2];
     unsigned long bi_basemem;
     unsigned long bi_extmem;
     unsigned long bi_symtab;