diff --git a/ChangeLog b/ChangeLog
index 6eb19f8a4..4ccdefe03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-08  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* loader/i386/linux.c (grub_cmd_linux): When processing `vga=', use
+	as fallback an equivalent option without depth.
+
 2009-06-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Not fail if unable to retrieve C/H/S on LBA disks
diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index e3726ec81..3b1f2f08d 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -761,17 +761,19 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 		break;
 	      }
 
-	    buf = grub_malloc (20);
+	    buf = grub_malloc (sizeof ("WWWWxHHHHxDD;WWWWxHHHH"));
 	    if (! buf)
 	      goto fail;
 	    
 	    linux_mode 
 	      = &linux_vesafb_modes[vid_mode - GRUB_LINUX_VID_MODE_VESA_START];
 	    
-	    grub_sprintf (buf, "%dx%dx%d", 
+	    grub_sprintf (buf, "%ux%ux%u;%ux%u", 
 			  linux_vesafb_res[linux_mode->res_index].width,
 			  linux_vesafb_res[linux_mode->res_index].height,
-			  linux_mode->depth);
+			  linux_mode->depth,
+			  linux_vesafb_res[linux_mode->res_index].width,
+			  linux_vesafb_res[linux_mode->res_index].height);
 	    grub_printf ("%s is deprecated. "
 			 "Use set gfxpayload=%s before "
 			 "linux command instead.\n",