diff --git a/ChangeLog b/ChangeLog
index d1a8c3462..2e8aa0161 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 	* hw/xfree86/dixmods/bitmapmod.c:
 	Bug #5089: Die, libbitmap, die!
 
+	* hw/xfree86/common/xf86Config.c:
+	Add bitmap to the ignored module list.
+
 2006-06-01  Daniel Stone  <daniel@freedesktop.org>
 
 	* Xext/Makefile.am:
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 740e7664e..6f6b52c98 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Config.c,v 1.30 2006/05/29 11:14:02 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Config.c,v 1.31 2006/06/01 19:49:55 daniels Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */
 
 
@@ -251,7 +251,7 @@ xf86ModulelistFromConfig(pointer **optlist)
 {
     int count = 0, i = 0;
     char **modulearray;
-    char **ignore = { "GLcore", "speedo", NULL };
+    char **ignore = { "GLcore", "speedo", "bitmap", NULL };
     pointer *optarray;
     XF86LoadPtr modp;