diff --git a/ChangeLog.videomask b/ChangeLog.videomask
new file mode 100644
index 000000000..7c58d0b57
--- /dev/null
+++ b/ChangeLog.videomask
@@ -0,0 +1,10 @@
+2009-11-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Use flag-based instead of hook-based video mode selection and "auto"
+	keyword.
+
+	* include/grub/video.h (grub_video_adapter): Changed 'setup' member.
+	(grub_video_set_mode): Changed prototype. All users updated.
+	(grub_video_check_mode_flag): New inline function.
+	* video/video.c (parse_modespec): New function.
+	(grub_video_set_mode): Parse flags and keywords.
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 382c45ca3..4c2aec617 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -155,7 +155,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
 	\
 	video/video.c video/fb/video_fb.c video/fb/fbblit.c             \
         video/fb/fbfill.c video/fb/fbutil.c commands/videotest.c        \
-	video/bitmap.c video/readers/tga.c video/readers/jpeg.c         \
+	video/bitmap.c video/bitmap_scale.c video/readers/tga.c video/readers/jpeg.c         \
 	video/readers/png.c font/font_cmd.c font/font.c term/gfxterm.c  \
 	io/bufio.c							\
 	\
@@ -175,6 +175,11 @@ grub_emu_SOURCES += disk/usbms.c util/usb.c bus/usb/usb.c	\
 grub_emu_LDFLAGS += $(LIBCURSES) $(LIBUSB)
 endif
 
+ifeq ($(enable_grub_emu_sdl), yes)
+grub_emu_SOURCES += util/sdl.c
+grub_emu_LDFLAGS += $(LIBSDL)
+endif
+
 sbin_SCRIPTS += grub-install
 grub_install_SOURCES = util/grub-install.in
 
diff --git a/video/video.c b/video/video.c
index eff257122..2e17ee7dc 100644
--- a/video/video.c
+++ b/video/video.c
@@ -624,7 +624,6 @@ grub_video_set_mode (const char *modestring,
       /* Loop thru all possible video adapter trying to find requested mode.  */
       for (p = grub_video_adapter_list; p; p = p->next)
 	{
-	  grub_err_t err;
 	  struct grub_video_mode_info mode_info;
 
 	  grub_memset (&mode_info, 0, sizeof (mode_info));