diff --git a/ChangeLog b/ChangeLog
index fbd4b2752..128c5f959 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/i386/pc/startup.S (grub_console_setcursor): Check
+	cursor shape for sanity.
+
 2010-10-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* docs/grub.texi (Installation): Document buggy BIOS install.
diff --git a/grub-core/kern/i386/pc/startup.S b/grub-core/kern/i386/pc/startup.S
index e03fc8301..6b43d9f14 100644
--- a/grub-core/kern/i386/pc/startup.S
+++ b/grub-core/kern/i386/pc/startup.S
@@ -820,6 +820,10 @@ FUNCTION(grub_console_setcursor)
 	DATA32	call	real_to_prot
 	.code32
 
+	cmp     %cl, %ch
+	jb      3f
+	movw    $0x0d0e, %cx
+3:	
 	movw	%cx, console_cursor_shape
 1:
 	/* set %cx to the designated cursor shape */