diff --git a/ChangeLog b/ChangeLog
index 48f42e41f..e1e07ecc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-23  Vladimir Serbinenko  <phcoder@gmail.com>
+2013-09-23  neil
+
+	* grub-core/loader/multiboot.c (grub_multiboot_set_console): Always use
+	video if no text is available.
+
 2013-09-23  Vladimir Serbinenko  <phcoder@gmail.com>
 2013-09-23  neil
 
diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
index 496e54c27..a37826c5d 100644
--- a/grub-core/loader/multiboot.c
+++ b/grub-core/loader/multiboot.c
@@ -216,8 +216,15 @@ grub_multiboot_set_console (int console_type, int accepted_consoles,
       grub_env_set ("gfxpayload", buf);
       grub_free (buf);
     }
- else
-   grub_env_set ("gfxpayload", "text");
+  else
+    {
+#if GRUB_MACHINE_HAS_VGA_TEXT
+      grub_env_set ("gfxpayload", "text");
+#else
+      /* Always use video if no VGA text is available.  */
+      grub_env_set ("gfxpayload", "auto");
+#endif
+    }
 
   accepts_video = !!(accepted_consoles & GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER);
   accepts_ega_text = !!(accepted_consoles & GRUB_MULTIBOOT_CONSOLE_EGA_TEXT);