diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 1022337..e1030fe 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -30,7 +30,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.9.0
-Release:   14%{?gitdate:.%{gitdate}}%{dist}
+Release:   15%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -104,6 +104,7 @@ Patch7002: xserver-1.9.0-vbe-panelid-sanity.patch
 # misc
 Patch7003: xserver-1.9.0-vbe-insanity.patch
 Patch7004: xserver-1.9.0-classic-default-mode.patch
+Patch7005: xserver-1.9.0-qxl-fallback.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -561,9 +562,13 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Wed Oct 13 2010 Adam Jackson <ajax@redhat.com> 1.9.0-15
+- xserver-1.9.0-qxl-fallback.patch: Use vesa for older qxl devices since
+  the driver lost backwards-compat. (#641991)
+
 * Mon Oct 11 2010 Adam Jackson <ajax@redhat.com> 1.9.0-14
 - xserver-1.9.0-classic-default-mode.patch: Bump classic driver default
-  mode size to 1024x768.
+  mode size to 1024x768. (related to #641991)
 
 * Tue Oct 05 2010 Adam Jackson <ajax@redhat.com> 1.9.0-13
 - xserver-1.9.0-vbe-insanity.patch: Fix thinko.
diff --git a/xserver-1.9.0-qxl-fallback.patch b/xserver-1.9.0-qxl-fallback.patch
new file mode 100644
index 0000000..e1cd0c6
--- /dev/null
+++ b/xserver-1.9.0-qxl-fallback.patch
@@ -0,0 +1,30 @@
+From 677e7a9f0e58c3b9e6598104934da68ac12bc32c Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 13 Oct 2010 11:16:31 -0400
+Subject: [PATCH] qxl v1 fallback
+
+---
+ hw/xfree86/common/xf86pciBus.c |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
+index 001625c..0d23f6a 100644
+--- a/hw/xfree86/common/xf86pciBus.c
++++ b/hw/xfree86/common/xf86pciBus.c
+@@ -1136,7 +1136,12 @@ videoPtrToDriverList(struct pci_device *dev,
+ 	    }
+ 	    break;
+ 	case 0x1106:		    driverList[0] = "openchrome"; break;
+-        case 0x1b36:		    driverList[0] = "qxl"; break;
++	case 0x1b36:
++	    /* The new qxl driver does not work with the old spice-0.4 qxl
++	       device for now (falling back to the vesa driver does work). */
++	    if (dev->revision != 1)
++		driverList[0] = "qxl";
++	    break;
+ 	case 0x1163:		    driverList[0] = "rendition"; break;
+ 	case 0x5333:
+ 	    switch (dev->device_id)
+-- 
+1.7.2.3
+