diff --git a/.cvsignore b/.cvsignore
index 8733459..4356de0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xorg-server-20080407.tar.bz2
+xorg-server-20080415.tar.bz2
diff --git a/commitid b/commitid
index 5ae22c2..2ca8d23 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-85b855f26f1578d52e9ed1dd0e3a9a1340ef1a2d
+5a2b538c1bc020af5bc33027ba0d9698338dca46
diff --git a/sources b/sources
index 6834cce..9993edb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3a69d1948a47ecd77d8e2adc9d34179a  xorg-server-20080407.tar.bz2
+2552f3c3b3c2c61ca85fd3d1515efcff  xorg-server-20080415.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 6369264..d00c801 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -15,12 +15,12 @@
 # RHEL5 bugfix sync
 
 %define pkgname xorg-server
-%define gitdate 20080407
+%define gitdate 20080415
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.901
-Release:   21.%{gitdate}%{?dist}
+Release:   22.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -52,7 +52,6 @@ Patch1014:  xserver-1.4.99-xaa-evict-pixmaps.patch
 Patch2013:  xserver-1.4.99-document-fontpath-correctly.patch
 
 # Trivial things to maybe merge upstream at next rebase
-Patch4000: xserver-1.5.0-quirk-acr.patch
 
 # Trivial things to never merge upstream ever
 # Don't merge this without protecting the gccisms.
@@ -514,6 +513,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 15 2008 Dave Airlie <airlied@redhat.com> 1.4.99.901-22.20080415
+- rebase to upstream server 1.5 branch from today - drop acr quirk
+
 * Thu Apr 10 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-21.20080407
 - xserver-1.5.0-selinux-off-by-default.patch: Re-disable selinux by default,
   again, in a way that lets you enable it if you really want to.
diff --git a/xserver-1.5.0-quirk-acr.patch b/xserver-1.5.0-quirk-acr.patch
deleted file mode 100644
index 1306bcf..0000000
--- a/xserver-1.5.0-quirk-acr.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b19027fbaea4c3a146926e862983e0e3411fff3d Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@linux.ie>
-Date: Wed, 9 Apr 2008 14:27:58 +1000
-Subject: [PATCH] quirk: add quirk for ACR 640x350 default mode is wrong
-
-RH #440186
----
- hw/xfree86/modes/xf86EdidModes.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
-index 8f7d45d..09d0039 100644
---- a/hw/xfree86/modes/xf86EdidModes.c
-+++ b/hw/xfree86/modes/xf86EdidModes.c
-@@ -93,6 +93,12 @@ static Bool quirk_prefer_large_60 (int scrnIndex, xf86MonPtr DDC)
- 	DDC->vendor.prod_id == 638)
- 	return TRUE;
- 
-+    /* Acer F51 */
-+    if (memcmp (DDC->vendor.name, "API", 4) == 0 &&
-+	DDC->vendor.prod_id == 0x7602)
-+	return TRUE;
-+
-+
-     return FALSE;
- }
- 
--- 
-1.5.4.1
-