diff --git a/radeon-6.6.1-use-mtdriver.patch b/radeon-6.6.1-use-mtdriver.patch
index 09a0271..6c9639b 100644
--- a/radeon-6.6.1-use-mtdriver.patch
+++ b/radeon-6.6.1-use-mtdriver.patch
@@ -1,14 +1,14 @@
---- xf86-video-ati-6.6.1/src/radeon_driver.c.mtdriver	2006-08-18 15:13:54.000000000 -0400
-+++ xf86-video-ati-6.6.1/src/radeon_driver.c	2006-08-18 15:50:44.000000000 -0400
-@@ -3271,6 +3271,7 @@
+--- xf86-video-ati-6.6.1/src/radeon_driver.c.mtdriver	2006-08-24 18:52:37.000000000 -0400
++++ xf86-video-ati-6.6.1/src/radeon_driver.c	2006-08-24 18:58:09.000000000 -0400
+@@ -3271,6 +3271,7 @@ static DisplayModePtr RADEONDDCModes(Scr
      int             j, tmp;
      char            stmp[32];
      xf86MonPtr      ddc   = pScrn->monitor->DDC;
-+    int		    preferred = 1;
++    int		    preferred = PREFERRED_TIMING_MODE(ddc->features.msc);
  
      /* Go thru detailed timing table first */
      for (j = 0; j < 4; j++) {
-@@ -3299,7 +3300,11 @@
+@@ -3299,7 +3300,11 @@ static DisplayModePtr RADEONDDCModes(Scr
  	    new->Clock      = d_timings->clock / 1000;
  	    new->Flags      = (d_timings->interlaced ? V_INTERLACE : 0);
  	    new->status     = MODE_OK;
@@ -21,7 +21,7 @@
  
  	    if (d_timings->sync == 3) {
  		switch (d_timings->misc) {
-@@ -3337,7 +3342,7 @@
+@@ -3337,7 +3342,7 @@ static DisplayModePtr RADEONDDCModes(Scr
  		    new->name = xnfalloc(strlen(p->name) + 1);
  		    strcpy(new->name, p->name);
  		    new->status = MODE_OK;
@@ -30,7 +30,7 @@
  
  		    count++;
  
-@@ -3369,7 +3374,7 @@
+@@ -3369,7 +3374,7 @@ static DisplayModePtr RADEONDDCModes(Scr
  			new->name = xnfalloc(strlen(p->name) + 1);
  			strcpy(new->name, p->name);
  			new->status = MODE_OK;
@@ -39,7 +39,7 @@
  
  			count++;
  
-@@ -3706,7 +3711,7 @@
+@@ -3706,7 +3711,7 @@ static int RADEONValidateFPModes(ScrnInf
  		new->Clock      = info->DotClock;
  		new->Flags     |= RADEON_USE_RMX;
  
@@ -48,7 +48,7 @@
  
  		new->next       = NULL;
  		new->prev       = last;
-@@ -3888,6 +3893,9 @@
+@@ -3888,6 +3893,9 @@ static int RADEONValidateMergeModes(Scrn
       * 'stretched' from their native mode.
       */
      if (info->MergeType == MT_CRT && !info->ddc_mode) {
@@ -58,7 +58,7 @@
   
  	modesFound =
  	    xf86ValidateModes(pScrn,
-@@ -4154,6 +4162,9 @@
+@@ -4154,6 +4162,9 @@ static Bool RADEONPreInitModes(ScrnInfoP
       */
      if (info->DisplayType == MT_CRT && !info->ddc_mode) {
  
diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec
index 3910895..75826db 100644
--- a/xorg-x11-drv-ati.spec
+++ b/xorg-x11-drv-ati.spec
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.1
-Release:   10%{?dist}
+Release:   11%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -102,6 +102,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Aug 24 2006 Adam Jackson <ajackson@redhat.com> 6.6.1-11.fc6
+- radeon-6.6.1-use-mtdriver.patch: Only flag modes with M_T_PREFERRED if
+  the EDID blocks says to.
+
 * Fri Aug 18 2006 Adam Jackson <ajackson@redhat.com> 6.6.1-10.fc6
 - radeon-6.6.1-use-mtdriver.patch: Use new M_T_DRIVER mode type for mode
   synthesis.