diff --git a/[refs] b/[refs]
index ebfee497e819..3e9140cd1216 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d60d2d8a423be91c5ad1a745c4e9dda9cea1b3c5
+refs/heads/master: 8db51668f5ef6ae31ed4e4f0c6e2976a190dfa11
diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig
index 51c4b25dad25..863c5983ee60 100644
--- a/trunk/drivers/video/Kconfig
+++ b/trunk/drivers/video/Kconfig
@@ -1194,6 +1194,7 @@ config FB_S3
 	select FB_TILEBLITTING
 	select FB_SVGALIB
 	select VGASTATE
+	select FONT_8x16 if FRAMEBUFFER_CONSOLE
 	---help---
 	  Driver for graphics boards with S3 Trio / S3 Virge chip.
 
diff --git a/trunk/drivers/video/s3fb.c b/trunk/drivers/video/s3fb.c
index f3470bb7d549..53f1eb9638ae 100644
--- a/trunk/drivers/video/s3fb.c
+++ b/trunk/drivers/video/s3fb.c
@@ -449,6 +449,9 @@ static int s3fb_set_par(struct fb_info *info)
 		info->flags &= ~FBINFO_MISC_TILEBLITTING;
 		info->tileops = NULL;
 
+		/* supports blit rectangles of any dimension */
+		info->pixmap.blit_x = ~(u32)0;
+		info->pixmap.blit_y = ~(u32)0;
 		offset_value = (info->var.xres_virtual * bpp) / 64;
 		screen_size = info->var.yres_virtual * info->fix.line_length;
 	} else {
@@ -457,6 +460,9 @@ static int s3fb_set_par(struct fb_info *info)
 
 		info->flags |= FBINFO_MISC_TILEBLITTING;
 		info->tileops = fasttext ? &s3fb_fast_tile_ops : &s3fb_tile_ops;
+		/* supports 8x16 tiles only */
+		info->pixmap.blit_x = 1 << (8 - 1);
+		info->pixmap.blit_y = 1 << (16 - 1);
 
 		offset_value = info->var.xres_virtual / 16;
 		screen_size = (info->var.xres_virtual * info->var.yres_virtual) / 64;