diff --git a/xorg/X11R7.6/rdp/rdpmain.c b/xorg/X11R7.6/rdp/rdpmain.c
index 48f5a2e9..7e0cb3b7 100644
--- a/xorg/X11R7.6/rdp/rdpmain.c
+++ b/xorg/X11R7.6/rdp/rdpmain.c
@@ -67,6 +67,9 @@ static int g_greenBits = 6;
 static int g_blueBits = 5;
 static int g_initOutputCalled = 0;
 /* Common pixmap formats */
+#if 0
+// FIXME
+// This is disabled to work around 32bpp pixmaps showing up all black when rendered
 static PixmapFormatRec g_formats[MAXFORMATS] =
 {
   { 1, 1, BITMAP_SCANLINE_PAD },
@@ -78,6 +81,18 @@ static PixmapFormatRec g_formats[MAXFORMATS] =
   { 32, 32, BITMAP_SCANLINE_PAD },
 };
 static int g_numFormats = 7;
+#else
+static PixmapFormatRec g_formats[MAXFORMATS] =
+{
+  { 1, 1, BITMAP_SCANLINE_PAD },
+  { 4, 8, BITMAP_SCANLINE_PAD },
+  { 8, 8, BITMAP_SCANLINE_PAD },
+  { 15, 16, BITMAP_SCANLINE_PAD },
+  { 16, 16, BITMAP_SCANLINE_PAD },
+  { 24, 32, BITMAP_SCANLINE_PAD },
+};
+static int g_numFormats = 6;
+#endif
 static miPointerSpriteFuncRec g_rdpSpritePointerFuncs =
 {
   /* these are in rdpinput.c */