diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 764581e..c81c855 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   38.%{gitdate}%{?dist}
+Release:   39.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -80,6 +80,7 @@ Patch6028: xserver-1.6.99-randr-error-debugging.patch
 Patch6030: xserver-1.6.99-right-of.patch
 Patch6031: xserver-1.6.99-dri2-crash-fixes.patch
 Patch6032: xserver-1.6.99-dri2-swapbuffers-fallback.patch
+Patch6033: xserver-1.6.99-default-modes.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -506,6 +507,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Fri Aug 21 2009 Adam Jackson <ajax@redhat.com> 1.6.99-39.20090820
+- xserver-1.6.99-default-modes.patch: Don't add default modes to the pool if
+  the driver returned real modes (and has no EDID).
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 1.6.99-38.20090820
 - rebuilt with new openssl
 
diff --git a/xserver-1.6.99-default-modes.patch b/xserver-1.6.99-default-modes.patch
new file mode 100644
index 0000000..782cc69
--- /dev/null
+++ b/xserver-1.6.99-default-modes.patch
@@ -0,0 +1,35 @@
+From 50552b0ee81b23b997bebd798b19b4a7e234a55f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Fri, 21 Aug 2009 13:51:45 -0400
+Subject: [PATCH] tweak default mode list yet again
+
+---
+ hw/xfree86/modes/xf86Crtc.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
+index 4f14a75..c6fd910 100644
+--- a/hw/xfree86/modes/xf86Crtc.c
++++ b/hw/xfree86/modes/xf86Crtc.c
+@@ -1567,7 +1567,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
+ 	int		    min_clock = 0;
+ 	int		    max_clock = 0;
+ 	double		    clock;
+-	Bool                add_default_modes = TRUE;
++	Bool                add_default_modes;
+ 	enum { sync_config, sync_edid, sync_default } sync_source = sync_default;
+ 	
+ 	while (output->probed_modes != NULL)
+@@ -1610,6 +1610,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
+ 	}
+ 	
+ 	output_modes = (*output->funcs->get_modes) (output);
++
++	/* if the driver found modes, don't second-guess it */
++	add_default_modes = (output_modes == NULL);
+ 	
+ 	edid_monitor = output->MonInfo;
+ 	
+-- 
+1.6.4
+