diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index e144287..cbca6a8 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.10.99.1
-Release:   3%{?gitdate:.%{gitdate}}%{dist}
+Release:   4%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -82,8 +82,6 @@ Patch6030: xserver-1.6.99-right-of.patch
 Patch6053: xserver-1.8-disable-vboxvideo.patch
 
 # misc
-Patch7005: xserver-1.9.0-qxl-fallback.patch
-
 Patch7006: xserver-1.10-pointer-barriers.patch
 Patch7007: xserver-1.10-fix-trapezoids.patch
 # from ajax/xserver-next
@@ -553,6 +551,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Apr 21 2011 Hans de Goede <hdegoede@redhat.com> 1.10.99.1-4.20110418
+- Drop xserver-1.9.0-qxl-fallback.patch, since the latest qxl driver
+  supports both revision 1 and 2 qxl devices (#642153)
+
 * Wed Apr 20 2011 Soren Sandmann <ssp@redhat.com> 1.10.99.1-3.20110418
 - xserver-1.10-fix-trapezoids.patch: this patch is necessary to prevent
   trap corruption with pixman 0.21.8.
diff --git a/xserver-1.9.0-qxl-fallback.patch b/xserver-1.9.0-qxl-fallback.patch
deleted file mode 100644
index cdb6645..0000000
--- a/xserver-1.9.0-qxl-fallback.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From edf5262c75416c2baf199e3d1c95b43f3e0d0cef 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 6/9] 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 4640ede..a7f0617 100644
---- a/hw/xfree86/common/xf86pciBus.c
-+++ b/hw/xfree86/common/xf86pciBus.c
-@@ -1141,7 +1141,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.4.4
-