diff --git a/srcpkgs/xorg-server/patches/xorgconfddir_without_prefix.patch b/srcpkgs/xorg-server/patches/xorgconfddir_without_prefix.patch
deleted file mode 100644
index 4d3c6d7e0cd..00000000000
--- a/srcpkgs/xorg-server/patches/xorgconfddir_without_prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Do not append $(prefix) to xorgconfddir, we are using prefix=/usr.
-
---- config/Makefile.in.orig	2010-04-02 11:16:05.543826596 +0200
-+++ config/Makefile.in	2010-04-02 11:16:30.854832565 +0200
-@@ -451,7 +451,7 @@ libconfig_la_SOURCES = config.c config-b
- @CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@	$(DBUS_LIBS) \
- @CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@	$(am__append_8)
- @CONFIG_UDEV_TRUE@libconfig_la_LIBADD = $(UDEV_LIBS) $(am__append_8)
--@CONFIG_UDEV_TRUE@xorgconfddir = $(prefix)/etc/X11/$(XF86CONFIGDIR)
-+@CONFIG_UDEV_TRUE@xorgconfddir = /etc/X11/$(XF86CONFIGDIR)
- @CONFIG_UDEV_TRUE@xorgconfd_DATA = 10-evdev.conf
- @CONFIG_DBUS_API_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@dbusconfigdir = $(sysconfdir)/dbus-1/system.d
- @CONFIG_DBUS_API_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@dbusconfig_DATA = xorg-server.conf
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index b27a2fd554b..a271ed96a62 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,6 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
-version=1.8.0
-revision=2
+version=1.8.0.902
 distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--with-dri-driver-path=/usr/lib/dri --enable-ipv6
@@ -13,7 +12,7 @@ configure_args="--with-dri-driver-path=/usr/lib/dri --enable-ipv6
 --disable-dmx --disable-xfree86-utils"
 short_desc="Modular X11 server from modular X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=423a8092e28affb83aa736695408e01fd4641040727f34ed6bcfae9c06018b77
+checksum=26814cc48627078582cbbe62e2e6064621cef8c985bba30d34547c42bc103ea5
 long_desc="
  The X.org X11 Server from the modularized source tree of X.org."
 
diff --git a/srcpkgs/xorg-server/xorg-server-devel.template b/srcpkgs/xorg-server/xorg-server-devel.template
index 1b743d9cb84..460d0d873d0 100644
--- a/srcpkgs/xorg-server/xorg-server-devel.template
+++ b/srcpkgs/xorg-server/xorg-server-devel.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run pkg-config
 Add_dependency run perl
 Add_dependency run flex