diff --git a/ChangeLog b/ChangeLog
index b798fe88b..42b120c2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-03  Bean  <bean123ch@gmail.com>
+
+	* script/sh/execute.c (grub_script_execute_cmdif): Reset grub_errno
+	after we get the result of if statement.
+
 2009-05-03  Bean  <bean123ch@gmail.com>
 
 	* Makefile.in (enable_efiemu): New variable.
diff --git a/script/sh/execute.c b/script/sh/execute.c
index 3856dd95c..123bca8b1 100644
--- a/script/sh/execute.c
+++ b/script/sh/execute.c
@@ -180,6 +180,8 @@ grub_script_execute_cmdif (struct grub_script_cmd *cmd)
   grub_script_execute_cmd (cmdif->exec_to_evaluate);
   result = grub_env_get ("?");
 
+  grub_errno = GRUB_ERR_NONE;
+
   /* Execute the `if' or the `else' part depending on the value of
      `?'.  */
   if (result && ! grub_strcmp (result, "0"))