diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 7ff27df..fa1d5d3 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.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -94,6 +94,7 @@ Patch6017: xserver-1.5.99.902-nouveau.patch
 # from master, may end up in 1.6.1.
 Patch6018: xserver-1.6.0-XIPropToInt.patch
 Patch6019: xserver-1.6.0-XATOM_FLOAT.patch
+Patch6020: xserver-1.6.0-preferred-thinko.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -511,6 +512,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Mar 02 2009 Adam Jackson <ajax@redhat.com> 1.6.0-3
+- xserver-1.6.0-preferred-thinko.patch: Fix a thinko in output setup when
+  only one head is attached.
+
 * Fri Feb 27 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.0-2
 - xserver-1.6.0-XIPropToInt.patch: add XIPropToInt helper function
   (requirement for XATOM_FLOAT patch)
diff --git a/xserver-1.6.0-preferred-thinko.patch b/xserver-1.6.0-preferred-thinko.patch
new file mode 100644
index 0000000..55c69e0
--- /dev/null
+++ b/xserver-1.6.0-preferred-thinko.patch
@@ -0,0 +1,28 @@
+From 33c791b421db742e78c74028a5ef5f6604e66c48 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 2 Mar 2009 13:00:31 -0500
+Subject: [PATCH] Fix output setup when only one head, and it's not the zeroth one.
+
+---
+ hw/xfree86/modes/xf86Crtc.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
+index a8fd099..ad6ca98 100644
+--- a/hw/xfree86/modes/xf86Crtc.c
++++ b/hw/xfree86/modes/xf86Crtc.c
+@@ -2070,9 +2070,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
+ 		     (float)config->output[p]->mm_height;
+ 
+ 	if (aspect)
+-	    preferred_match[0] = bestModeForAspect(config, enabled, aspect);
++	    preferred_match[p] = bestModeForAspect(config, enabled, aspect);
+ 
+-	if (preferred_match[0])
++	if (preferred_match[p])
+ 	    ret = TRUE;
+ 
+     } while (0);
+-- 
+1.6.1.3
+