diff --git a/preferred_mode-fix.diff b/preferred_mode-fix.diff
new file mode 100644
index 0000000..40e55aa
--- /dev/null
+++ b/preferred_mode-fix.diff
@@ -0,0 +1,10 @@
+--- hw/xfree86/modes/xf86Crtc.c.orig	2007-10-04 12:45:33.070367500 +0200
++++ hw/xfree86/modes/xf86Crtc.c	2007-10-04 12:49:45.850165250 +0200
+@@ -1416,6 +1416,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, 
+ 			output->probed_modes = mode;
+ 		    }
+ 		    mode->type |= M_T_PREFERRED;
++		    break;
+ 		}
+ 		else
+ 		    mode->type &= ~M_T_PREFERRED;
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 0b1ec58..89c0483 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct  4 12:55:11 CEST 2007 - sndirsch@suse.de
+
+- preferred_mode-fix.diff
+  * fixed endless loop if PreferredMode is set (Bug #329724)
+
 -------------------------------------------------------------------
 Wed Oct  3 19:08:19 CEST 2007 - sndirsch@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 55a7c90..769598e 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -21,7 +21,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.3
-Release:        3
+Release:        4
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -88,6 +88,7 @@ Patch77:        fbdevhw.diff
 Patch79:        edit_data_sanity_check.diff
 Patch80:        pixman.diff
 Patch81:        xserver-1.3.0-xkb-and-loathing.patch
+Patch82:        preferred_mode-fix.diff
 
 %description
 This package contains the X.Org Server.
@@ -197,6 +198,7 @@ popd
 %patch79 -p1
 %patch80
 %patch81 -p1
+%patch82 -p0
 
 %build
 pushd xorg-docs-*
@@ -527,6 +529,9 @@ exit 0
 /usr/bin/Xvnc
 %endif
 %changelog
+* Thu Oct 04 2007 - sndirsch@suse.de
+- preferred_mode-fix.diff
+  * fixed endless loop if PreferredMode is set (Bug #329724)
 * Wed Oct 03 2007 - sndirsch@suse.de
 - removed obsolete patch p_pci-domain.diff (Bug #308693, comment #26)
 - apply p_pci-off-by-one.diff.ia64 on all platforms since it clearly