diff --git a/BUGS b/BUGS
index 4074391ee..a82d03f92 100644
--- a/BUGS
+++ b/BUGS
@@ -28,3 +28,8 @@ Known problems/bugs:
 
   - Hitting Ctrl-Alt-Delete when in GRUB locks some machines.  Use Reset
     for now.  (This apparently hasn't been observed for a while)
+
+  - Stage 1 cannot read data from any >4128705 block. Ask okuji for more
+    information.
+
+  - Stage 1.5 does not work in some environments. Why?
diff --git a/NEWS b/NEWS
index 054c699cf..261a7e6c3 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ New:
   stage2.
 * Color menu support.
 * New command "quit".
+* The man page for /sbin/grub.
 
 New in 0.5.91 - 1999-03-14, Gordon Matzigkeit:
 * LBA and preliminary AWARD BIOS disk extension support.
diff --git a/README b/README
index d71003fa4..f8faa9de6 100644
--- a/README
+++ b/README
@@ -21,6 +21,16 @@ you use the following utilities:
 and 2.9.1.0.x, and we support only 2.9.1.0.x. It is available from
 ftp.XX.kernel.org (XX is the country code, such as `jp').
 
+* ncurses 4.0 and later (1.9.9 is too buggy, so don't use it.)
+
+  Ncurses is used for /sbin/grub, so it may not be needed if you don't
+use /sbin/grub. Ncurses 4.0 is available from many ftp sites. (Should we
+use terminfo or termcap directly?)
+
+
+These below are required when you develop GRUB or when you get it from
+the CVS:
+
 * autoconf 19990301 and later
 
   Autoconf 2.13 has a bug that can't handle any macro with arguments,
@@ -33,11 +43,6 @@ http://sourceware.cygnus.com/autoconf for more information.
 an unreleased version from the CVS. See
 http://sourceware.cygnus.com/automake for more information.
 
-* ncurses 4.0 and later (1.9.9 is too buggy, so don't use it.)
-
-  Ncurses is used for /sbin/grub, so it may not be needed if you don't
-use /sbin/grub. Ncurses 4.0 is available from many ftp sites.
-
 * texinfo 3.12h and later
 
   The latest snapshot of Texinfo is available from alpha.gnu.org.
diff --git a/TODO b/TODO
index 5997e78e4..7ab14609f 100644
--- a/TODO
+++ b/TODO
@@ -38,4 +38,6 @@ Add ``configfile'' command, in a clean way.
 
 Add keyboard layout configuration support.
 
-Finish the GNU GRUB manual, grub.texi.
+Clean up and enhance the manuals, especially concept indexes.
+
+Add more filesystems support (minix, FAT32, etc.)
diff --git a/docs/grub.texi b/docs/grub.texi
index addf22a8e..64ae9bf1a 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -462,7 +462,7 @@ First, copy @file{e2fs_stage1_5} to the first cylinder after MBR
 (@pxref{MBR}):
 
 @example
-dd if=e2fs_stage1_5/e2fs_stage1_5 of=/dev/hda bs=512 seek=1
+dd if=stage2/e2fs_stage1_5 of=/dev/hda bs=512 seek=1
 @end example
 
 Second, specify the stage2 argument in the block-list format:
@@ -886,6 +886,10 @@ routines. The format is @samp{<@var{sector}, @var{byte_offset},
 
 Filesystem test mode is turned off by any uses of the @command{install=}
 or @command{testload=} commands.
+
+@item quit
+Finish GRUB in the Stage 2 emulator @command{grub} (@pxref{Stage 2
+emulator}). This is just ignored in the native Stage 2.
 @end table