diff --git a/ChangeLog b/ChangeLog
index d0f2acacc..1a533ae17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-30  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (Commands): Link to "GRUB only offers a rescue
+	shell".
+
 2011-03-30  Alexey Shvetsov <alexxy@gentoo.org>
 
 	* util/grub.d/10_linux.in: Add gentoo-specific config filename.
diff --git a/docs/grub.texi b/docs/grub.texi
index dd3afcf48..fa38b96ff 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -2821,7 +2821,9 @@ anywhere in the menu or specifically in the menu entries.
 
 In rescue mode, only the @command{insmod} (@pxref{insmod}), @command{ls}
 (@pxref{ls}), @command{set} (@pxref{set}), and @command{unset}
-(@pxref{unset}) commands are normally available.
+(@pxref{unset}) commands are normally available.  If you end up in rescue
+mode and do not know what to do, then @pxref{GRUB only offers a rescue
+shell}.
 
 @menu
 * Menu-specific commands::