diff --git a/.cvsignore b/.cvsignore
index eba9535..aea1581 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xorg-server-20080303.tar.bz2
+xorg-server-20080304.tar.bz2
diff --git a/commitid b/commitid
index 7a799e1..6882e99 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-1bda57a41ea3bb3a624a5e75f421160ac98a0804
+e4d92a13e83b4327067c97d8c9fe151a1c0b35af
diff --git a/sources b/sources
index 0cf3828..7472b04 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bbe69d049ba5bd8d764787e10a95dfd3  xorg-server-20080303.tar.bz2
+e81f00d089163f9a88bc89e73da0b2c3  xorg-server-20080304.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 914fb18..bd69d0c 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -15,12 +15,12 @@
 # RHEL5 bugfix sync
 
 %define pkgname xorg-server
-%define gitdate 20080303
+%define gitdate 20080304
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.900
-Release:   0.27.%{gitdate}%{?dist}
+Release:   0.28.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -159,6 +159,8 @@ Requires: xorg-x11-server-common >= %{version}-%{release}
 # These drivers were dropped in F7 for being broken, so uninstall them.
 Obsoletes: xorg-x11-drv-elo2300 <= 1.1.0-2.fc7
 Obsoletes: xorg-x11-drv-joystick <= 1.1.0-2.fc7
+# Dropped from F9 for being broken, uninstall it.
+Obsoletes: xorg-x11-drv-magictouch <= 1.0.0.5-5.fc8
 # Force sufficiently new libpciaccess
 Conflicts: libpciaccess < 0.9.1-2
 
@@ -504,6 +506,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar 04 2008 Adam Jackson <ajax@redhat.com> 1.4.99.900-0.28.20080304
+- Today's 1.5 snapshot.
+- Obsolete: xorg-x11-drv-magictouch to get it uninstalled.
+
 * Mon Mar 03 2008 Adam Jackson <ajax@redhat.com> 1.4.99.900-0.27.20080303
 - Switch to 1.5 branch and rebase.