diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index e9701fe..9f65bb0 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   41%{?dist}
+Release:   42%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -643,6 +643,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Feb 12 2008 Adam Jackson <ajax@redhat.com> 1.3.0.0-42
+- xserver-1.3.0-avoid-ps2-probe.patch: Delete an irrelevant hunk against
+  the module loader that broke Xorg -configure.  (#397461)
+
 * Mon Feb 11 2008 Adam Jackson <ajax@redhat.com> 1.3.0.0-41
 - xserver-1.3.0-xorg-conf-man-randr-update.patch: Various fixes. (#429988)
 
diff --git a/xserver-1.3.0-avoid-ps2-probe.patch b/xserver-1.3.0-avoid-ps2-probe.patch
index 179995b..ab565f7 100644
--- a/xserver-1.3.0-avoid-ps2-probe.patch
+++ b/xserver-1.3.0-avoid-ps2-probe.patch
@@ -1,26 +1,3 @@
-diff -up xorg-server-1.3.0.0/hw/xfree86/loader/loadmod.c.jx xorg-server-1.3.0.0/hw/xfree86/loader/loadmod.c
---- xorg-server-1.3.0.0/hw/xfree86/loader/loadmod.c.jx	2007-04-16 12:37:51.000000000 -0400
-+++ xorg-server-1.3.0.0/hw/xfree86/loader/loadmod.c	2007-10-10 19:13:47.000000000 -0400
-@@ -408,7 +408,8 @@ FindModuleInSubdir(const char *dirpath, 
-     while ((direntry = readdir(dir))) {
-         if (direntry->d_name[0] == '.')
-             continue;
--        if ((stat(direntry->d_name, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) {
-+
-+	if (direntry->d_type == DT_DIR) {
-             snprintf(tmpBuf, PATH_MAX, "%s/%s", dirpath, direntry->d_name);
-             if ((ret = FindModuleInSubdir(tmpBuf, module)))
-                 break;
-@@ -525,8 +526,7 @@ LoaderListDirs(const char **subdirlist, 
- 		    if (dirlen + strlen(dp->d_name) > PATH_MAX)
- 			continue;
- 		    strcpy(fp, dp->d_name);
--		    if (!(stat(buf, &stat_buf) == 0 &&
--			  S_ISREG(stat_buf.st_mode)))
-+		    if (dp->d_type == DT_REG)
- 			continue;
- 		    for (p = patterns; p->pattern; p++) {
- 			if (regexec(&p->rex, dp->d_name, 2, match, 0) == 0 &&
 diff -up xorg-server-1.3.0.0/hw/xfree86/os-support/linux/lnx_mouse.c.jx xorg-server-1.3.0.0/hw/xfree86/os-support/linux/lnx_mouse.c
 --- xorg-server-1.3.0.0/hw/xfree86/os-support/linux/lnx_mouse.c.jx	2006-09-18 02:04:18.000000000 -0400
 +++ xorg-server-1.3.0.0/hw/xfree86/os-support/linux/lnx_mouse.c	2007-10-11 09:53:33.000000000 -0400