diff --git a/ChangeLog b/ChangeLog
index 8ac9309a4..a7aad1f70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-08  Colin Watson  <cjwatson@ubuntu.com>
+
+	* script/sh/execute.c (grub_script_execute_cmdline): Set "?" in
+	unknown-command case.  Fixes bug #27320.
+
 2009-09-08  Felix Zielcke  <fzielcke@z-51.de>
 
 	* kern/rescue_parser.c (grub_rescue_parse_line): Only suggest to try
diff --git a/script/sh/execute.c b/script/sh/execute.c
index e0b7b2ebf..e9064ad2f 100644
--- a/script/sh/execute.c
+++ b/script/sh/execute.c
@@ -122,6 +122,10 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 	      grub_errno = GRUB_ERR_NONE;
 	    }
 	  grub_free (assign);
+
+	  grub_sprintf (errnobuf, "%d", grub_errno);
+	  grub_env_set ("?", errnobuf);
+
 	  return 0;
 	}
     }