diff --git a/ChangeLog b/ChangeLog
index ec520bebe..57ec95fa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-21  Jordan Uggla  <jordan.uggla@gmail.com>
+
+       * docs/grub.texi Fix documentation of GRUB_HIDDEN_TIMOUNT to match the
+       actual implementation. Specifically, clarify that the grub menu will
+       be displayed for GRUB_TIMOUT seconds after the hidden timeout has
+       passed.
+
 2012-05-21  Benjamin Herrenschmidt <benh@kernel.crashing.org>
 
 	* grub-core/kern/powerpc/dl.c (trampoline_template): Use r12 instead
diff --git a/docs/grub.texi b/docs/grub.texi
index 430ab46a2..ecf986bc0 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1135,7 +1135,11 @@ indefinitely.
 
 @item GRUB_HIDDEN_TIMEOUT
 Wait this many seconds for a key to be pressed before displaying the menu.
-If no key is pressed during that time, boot immediately.  Unset by default.
+If no key is pressed during that time, display the menu for the number of
+seconds specified in GRUB_TIMEOUT before booting the default entry. We expect
+that most people who use GRUB_HIDDEN_TIMEOUT will want to have GRUB_TIMEOUT set 
+to @samp{0} so that the menu is not displayed at all unless a key is pressed.
+Unset by default.
 
 @item GRUB_HIDDEN_TIMEOUT_QUIET
 In conjunction with @samp{GRUB_HIDDEN_TIMEOUT}, set this to @samp{true} to