diff -u -r hw/xfree86.orig/common/xf86Globals.c hw/xfree86/common/xf86Globals.c
--- hw/xfree86.orig/common/xf86Globals.c	2006-07-05 12:37:32.000000000 +0200
+++ hw/xfree86/common/xf86Globals.c	2006-07-05 14:59:51.000000000 +0200
@@ -176,7 +176,7 @@
 };
 const char *xf86ConfigFile = NULL;
 const char *xf86InputDeviceList = NULL;
-const char *xf86ModulePath = DEFAULT_MODULE_PATH;
+const char *xf86ModulePath = "/usr/LIBDIR/xorg/modules/updates,/usr/LIBDIR/xorg/modules";
 MessageType xf86ModPathFrom = X_DEFAULT;
 const char *xf86LogFile = DEFAULT_LOGPREFIX;
 MessageType xf86LogFileFrom = X_DEFAULT;
diff -u -r hw/xfree86.orig/loader/loader.c hw/xfree86/loader/loader.c
--- hw/xfree86.orig/loader/loader.c	2006-07-05 12:37:33.000000000 +0200
+++ hw/xfree86/loader/loader.c	2006-07-05 15:00:41.000000000 +0200
@@ -410,7 +410,7 @@
      */
     {
 	int errmaj, errmin, wasLoaded; /* place holders */
-	char *xcrtpath = DEFAULT_MODULE_PATH "/libcrt.a";
+	char *xcrtpath = "/usr/LIBDIR/xorg/modules/updates,/usr/LIBDIR/xorg/modules" "/libcrt.a";
 	char *uwcrtpath = "/usr/ccs/lib/libcrt.a";
 	char *path;
 	struct stat st;
--- hw/xfree86/common/xf86Init.c.orig	2006-12-03 17:35:17.412779270 +0100
+++ hw/xfree86/common/xf86Init.c	2006-12-03 17:37:29.048826467 +0100
@@ -1876,7 +1876,7 @@
 static void
 xf86PrintDefaultModulePath(void)
 {
-  ErrorF("%s\n", DEFAULT_MODULE_PATH);
+  ErrorF("/usr/LIBDIR/xorg/modules/updates,/usr/LIBDIR/xorg/modules\n");
 }
 
 static void