diff --git a/ChangeLog b/ChangeLog
index f96b99f77..4ef13e931 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* util/grub.d/10_linux.in (linux_entry): Set gfxpayload=keep when it
+	can be reliably determined to be supported.
+
 2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* loader/i386/linux.c (grub_cmd_linux): If `vga=' was used, write down
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 3ecf454e2..90a6e83e7 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -60,6 +60,15 @@ linux_entry ()
   fi
   printf "menuentry \"${title}\" {\n" "${os}" "${version}"
   save_default_entry | sed -e "s/^/\t/"
+
+  # 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 grep -qx "CONFIG_FB_EFI=y" /boot/config-${version} 2> /dev/null ; then
+    cat << EOF
+	set gfxpayload=keep
+EOF
+  fi
+
   if [ -z "${prepare_boot_cache}" ]; then
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi