diff --git a/ChangeLog b/ChangeLog
index 8a9939889..5837f6f72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* hw/xfree86/common/xf86Config.c:
 	Bug #5359: Fix a segfault (Mark Kettenis)
 
+	* fb/fbpict.c:
+	Fix an fb regression on A8 pictures.  (Fredrik Höglund)
+
 2005-12-19  Adam Jackson  <ajax@freedesktop.org>
 
 	* hw/xfree86/doc/man/xorg.conf.man.pre:
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 05e0ef03f..5ab3756b9 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -881,7 +881,7 @@ fbComposite (CARD8      op,
     case PictOpSrc:
 #ifdef USE_MMX
 	if (!pMask && pSrc->format == pDst->format &&
-	    pSrc->pDrawable != pDst->pDrawable)
+	    pSrc->format != PICT_a8 && pSrc->pDrawable != pDst->pDrawable)
 	{
 	    func = fbCompositeCopyAreammx;
 	}