diff --git a/.gitignore b/.gitignore
index 92ad03a..cef6997 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ xorg-server-1.9.1.tar.bz2
 /xorg-server-20101125.tar.xz
 /xorg-server-20101201.tar.xz
 /xorg-server-1.10.0.tar.bz2
+/xorg-server-20110418.tar.xz
diff --git a/commitid b/commitid
index 6f8c877..557c449 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-02449ee24b484c9fea501df5274d95a9f87cab23
+b3d2164a0361f636bfe77b51456bee9213af4f13
diff --git a/sources b/sources
index 82413a4..a871f7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-57c143c5cfa507680933b6c4904f829c  xorg-server-1.10.0.tar.bz2
+1ae649350f2084fdd348589e68b44e55  xorg-server-20110418.tar.xz
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 04e37d9..7e9bb03 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -25,12 +25,12 @@
 %define extension_minor 0
 
 %define pkgname xorg-server
-#define gitdate 20110225
+%define gitdate 20110418
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.10.0
-Release:   7%{?gitdate:.%{gitdate}}%{dist}
+Version:   1.10.99.1
+Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -397,7 +397,6 @@ cp {,%{inst_srcdir}/}doc/xml/xserver.ent.in
 cp {,%{inst_srcdir}/}doc/xml/Xserver-spec.xml
 cp {,%{inst_srcdir}/}doc/xml/dtrace/Xserver-DTrace.xml
 cp {,%{inst_srcdir}/}hw/xquartz/bundle/cpprules.in
-cp {,%{inst_srcdir}/}hw/dmx/doc/doxygen.conf.in
 cp {,%{inst_srcdir}/}doc/man/Xserver.man
 cp {,%{inst_srcdir}/}doc/smartsched
 cp xkb/README.compiled %{inst_srcdir}/xkb
@@ -554,6 +553,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Apr 18 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.10.99.1-1.20110418
+- Today's server from git
+
 * Wed Mar 30 2011 Adam Jackson <ajax@redhat.com> 1.10.0-7
 - xserver-1.10-glx-pixmap-crash.patch, xserver-1.10-bg-none-revert.patch:
   bugfixes from xserver-next