diff --git a/ChangeLog b/ChangeLog
index 557a33a19..df404336e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Fix handling of string like \"hello\" and "a
+	b"
+
+	* script/sh/lexer.c (check_textstate): accept GRUB_PARSER_STATE_ESC
+	(grub_script_yylex): fix parsing of quoting, escaping and newline
+
 2009-06-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/i386/multiboot.c (grub_multiboot_get_bootdev): fix partition 
diff --git a/script/sh/lexer.c b/script/sh/lexer.c
index aa8ac35aa..f21430fe1 100644
--- a/script/sh/lexer.c
+++ b/script/sh/lexer.c
@@ -39,6 +39,7 @@ static int
 check_textstate (grub_parser_state_t state)
 {
   return (state == GRUB_PARSER_STATE_TEXT
+	  || state == GRUB_PARSER_STATE_ESC
 	  || state == GRUB_PARSER_STATE_QUOTE
 	  || state == GRUB_PARSER_STATE_DQUOTE);
 }