diff --git a/ChangeLog b/ChangeLog
index 3f9d82987..d811fb381 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* video/fb/fbblit.c (grub_video_fbblit_blend_XXXA8888_1bit): Handle
+	alpha_mask_size == 0 case.
+
 2010-03-14  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	GRUB shell lexer and parser improvements.
diff --git a/video/fb/fbblit.c b/video/fb/fbblit.c
index a0f44d268..15797be97 100644
--- a/video/fb/fbblit.c
+++ b/video/fb/fbblit.c
@@ -1170,10 +1170,15 @@ grub_video_fbblit_blend_XXXA8888_1bit (struct grub_video_fbblit_info *dst,
 	  grub_uint8_t a;
 
 	  if (*srcptr & srcmask)
-	    color = fgcolor;
+	    {
+	      color = fgcolor;
+	      a = src->mode_info->fg_alpha;
+	    }
 	  else
-	    color = bgcolor;
-	  a = (color >> 24) & 0xff;
+	    {
+	      color = bgcolor;
+	      a = src->mode_info->bg_alpha;
+	    }
 
 	  if (a == 255)
 	    *(grub_uint32_t *) dstptr = color;