diff --git a/ChangeLog b/ChangeLog
index 233e1fc2d..e7617dc1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-26  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub.d/10_linux.in (linux_entry): Don't default to
+	gfxpayload=keep if Linux doesn't support video handover.
+
 2010-02-25  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Don't compile video modules on yeeloong since video subsystem is part
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 046874ef0..2c60bc681 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -66,7 +66,8 @@ linux_entry ()
   # Use ELILO's generic "efifb" when it's known to be available.
   # FIXME: We need an interface to select vesafb in case efifb can't be used.
   if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then
-      if grep -qx "CONFIG_FB_EFI=y" /boot/config-${version} 2> /dev/null ; then
+      if grep -qx "CONFIG_FB_EFI=y" /boot/config-${version} 2> /dev/null \
+	  && grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" /boot/config-${version} 2> /dev/null; then
 	  cat << EOF
 	set gfxpayload=keep
 EOF