diff --git a/ChangeLog b/ChangeLog
index 64a89cbe5..65b82c614 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-24  Robert Millan  <rmh@gnu.org>
+
+	* grub-core/video/i386/pc/vbe.c (grub_video_vbe_setup): Replace
+	numeric constants with their symbolic equivalent.
+	Taken from branch "vbe-on-coreboot".
+
 2013-10-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* docs/grub.texi: Fix ordering and use pxref rather than xref.
diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c
index 6f7ede1fc..f6cd51c7f 100644
--- a/grub-core/video/i386/pc/vbe.c
+++ b/grub-core/video/i386/pc/vbe.c
@@ -1023,19 +1023,19 @@ grub_video_vbe_setup (unsigned int width, unsigned int height,
           break;
         }
 
-      if ((vbe_mode_info.mode_attributes & 0x001) == 0)
+      if ((vbe_mode_info.mode_attributes & GRUB_VBE_MODEATTR_SUPPORTED) == 0)
         /* If not available, skip it.  */
         continue;
 
-      if ((vbe_mode_info.mode_attributes & 0x008) == 0)
+      if ((vbe_mode_info.mode_attributes & GRUB_VBE_MODEATTR_COLOR) == 0)
         /* Monochrome is unusable.  */
         continue;
 
-      if ((vbe_mode_info.mode_attributes & 0x080) == 0)
+      if ((vbe_mode_info.mode_attributes & GRUB_VBE_MODEATTR_LFB_AVAIL) == 0)
         /* We support only linear frame buffer modes.  */
         continue;
 
-      if ((vbe_mode_info.mode_attributes & 0x010) == 0)
+      if ((vbe_mode_info.mode_attributes & GRUB_VBE_MODEATTR_GRAPHICS) == 0)
         /* We allow only graphical modes.  */
         continue;