diff --git a/ChangeLog b/ChangeLog
index 7f2b10a6c..101370144 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-24  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* stage2/stage2.c (run_menu): Call cls outside the loop to run
+	scripts.
+	* stage2/cmdline.c (run_script): Prompt a user's intervention,
+	only when FALLBACK_ENTRY is negative.
+	
 2002-02-11  Pavel Roskin  <proski@gnu.org>
 
 	* util/grub-install.in (find_device): New function - find block
diff --git a/docs/grub-install.8 b/docs/grub-install.8
index ff9ecfd32..be69cee58 100644
--- a/docs/grub-install.8
+++ b/docs/grub-install.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-INSTALL "8" "February 2002" "grub-install (GNU GRUB 0.91)" FSF
+.TH GRUB-INSTALL "8" "March 2002" "grub-install (GNU GRUB 0.91)" FSF
 .SH NAME
 grub-install \- install GRUB on your drive
 .SH SYNOPSIS
diff --git a/docs/grub-md5-crypt.8 b/docs/grub-md5-crypt.8
index 0abe60843..af40989e4 100644
--- a/docs/grub-md5-crypt.8
+++ b/docs/grub-md5-crypt.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-MD5-CRYPT "8" "February 2002" "grub-md5-crypt (GNU GRUB )" FSF
+.TH GRUB-MD5-CRYPT "8" "March 2002" "grub-md5-crypt (GNU GRUB )" FSF
 .SH NAME
 grub-md5-crypt \- Encrypt a password in MD5 format
 .SH SYNOPSIS
diff --git a/docs/grub.8 b/docs/grub.8
index 8101f7206..77c0b222a 100644
--- a/docs/grub.8
+++ b/docs/grub.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB "8" "February 2002" "grub (GNU GRUB 0.91)" FSF
+.TH GRUB "8" "March 2002" "grub (GNU GRUB 0.91)" FSF
 .SH NAME
 grub \- the grub shell
 .SH SYNOPSIS
diff --git a/docs/mbchk.1 b/docs/mbchk.1
index 6e40ffd67..bc69ce50b 100644
--- a/docs/mbchk.1
+++ b/docs/mbchk.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH MBCHK "1" "February 2002" "mbchk (GNU GRUB 0.91)" FSF
+.TH MBCHK "1" "March 2002" "mbchk (GNU GRUB 0.91)" FSF
 .SH NAME
 mbchk \- check the format of a Multiboot kernel
 .SH SYNOPSIS
diff --git a/stage2/cmdline.c b/stage2/cmdline.c
index f8aadb622..614fdd7bb 100644
--- a/stage2/cmdline.c
+++ b/stage2/cmdline.c
@@ -197,8 +197,15 @@ run_script (char *script, char *heap)
       if (errnum)
 	{
 	  errnum = ERR_NONE;
-	  grub_printf ("\nPress any key to continue...");
-	  (void) getkey ();
+
+	  /* If a fallback entry is defined, don't prompt a user's
+	     intervention.  */
+	  if (fallback_entry < 0)
+	    {
+	      grub_printf ("\nPress any key to continue...");
+	      (void) getkey ();
+	    }
+	  
 	  return 1;
 	}
 
diff --git a/stage2/stage2.c b/stage2/stage2.c
index ca73734d4..1d9eccc12 100644
--- a/stage2/stage2.c
+++ b/stage2/stage2.c
@@ -808,10 +808,10 @@ restart:
   /* Enable the auto fill mode.  */
   auto_fill = 1;
   
+  cls ();
+
   while (1)
     {
-      cls ();
-
       if (config_entries)
 	printf ("  Booting \'%s\'\n\n",
 		get_entry (menu_entries, first_entry + entryno, 0));