diff --git a/fb/fbpict.c b/fb/fbpict.c
index a666a0d40..cb0dcd138 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -1048,7 +1048,7 @@ fbComposite (CARD8      op,
 		}
 	    }
 	}
-	else
+	else /* no mask */
 	{
 	    if (srcRepeat && 
 		pSrc->pDrawable->width == 1 &&
@@ -1098,6 +1098,27 @@ fbComposite (CARD8      op,
 			break;
 		    }
 		    break;
+		case PICT_x8r8g8b8:
+		    switch (pDst->format) {
+		    case PICT_a8r8g8b8:
+		    case PICT_x8r8g8b8:
+#ifdef USE_MMX
+			if (fbHaveMMX())
+			    func = fbCompositeCopyAreammx;
+#endif
+			break;
+		    }
+		case PICT_x8b8g8r8:
+		    switch (pDst->format) {
+		    case PICT_a8b8g8r8:
+		    case PICT_x8b8g8r8:
+#ifdef USE_MMX
+			if (fbHaveMMX())
+			    func = fbCompositeCopyAreammx;
+#endif
+			break;
+		    }
+		    break;
 		case PICT_a8b8g8r8:
 		    switch (pDst->format) {
 		    case PICT_a8b8g8r8: