diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk
index 3b9a9ae199..60306f4949 100644
--- a/packages/x11/xserver/xorg-server/package.mk
+++ b/packages/x11/xserver/xorg-server/package.mk
@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="xorg-server"
-PKG_VERSION="1.14.4"
+PKG_VERSION="1.14.99.904"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libpciaccess libX11 libXfont libdrm openssl freetype pixman systemd xorg-launch-helper"
-PKG_BUILD_DEPENDS_TARGET="toolchain util-macros font-util fontsproto randrproto recordproto renderproto dri2proto fixesproto damageproto scrnsaverproto videoproto inputproto xf86dgaproto xf86vidmodeproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm openssl freetype pixman fontsproto systemd"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros font-util fontsproto randrproto recordproto renderproto dri2proto fixesproto damageproto scrnsaverproto videoproto inputproto xf86dgaproto xf86vidmodeproto xf86driproto xf86miscproto glproto presentproto libpciaccess libX11 libXfont libxkbfile libdrm openssl freetype pixman fontsproto systemd"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/xserver"
 PKG_SHORTDESC="xorg-server: The Xorg X server"
diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-Mesa-10.0.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-Mesa-10.0.patch
deleted file mode 100644
index b6be233a82..0000000000
--- a/packages/x11/xserver/xorg-server/patches/xorg-server-Mesa-10.0.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 7ecfab47eb221dbb996ea6c033348b8eceaeb893 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Tue, 22 Oct 2013 21:22:04 +0000
-Subject: glx: Add support for the new DRI loader entrypoint.
-
-This is going to be exposed (and not the old entrypoint) for some DRI
-drivers once the megadrivers series lands, and the plan is to
-eventually transition all drivers to that.  Hopefully this is
-unobtrusive enough to merge to stable X servers so that they can be
-compatible with new Mesa versions.
-
-v2: typo fix in the comment
-
-Signed-off-by: Eric Anholt <eric@anholt.net>
-Reviewed-by: Adam Jackson <ajax@redhat.com>
-Signed-off-by: Keith Packard <keithp@keithp.com>
----
-diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c
-index b027f24..0ab3e30 100644
---- a/glx/glxdricommon.c
-+++ b/glx/glxdricommon.c
-@@ -211,6 +211,14 @@ glxConvertConfigs(const __DRIcoreExtension * core,
- 
- static const char dri_driver_path[] = DRI_DRIVER_PATH;
- 
-+/* Temporary define to allow building without a dri_interface.h from
-+ * updated Mesa.  Some day when we don't care about Mesa that old any
-+ * more this can be removed.
-+ */
-+#ifndef __DRI_DRIVER_GET_EXTENSIONS
-+#define __DRI_DRIVER_GET_EXTENSIONS "__driDriverGetExtensions"
-+#endif
-+
- void *
- glxProbeDriver(const char *driverName,
-                void **coreExt, const char *coreName, int coreVersion,
-@@ -219,7 +227,8 @@ glxProbeDriver(const char *driverName,
-     int i;
-     void *driver;
-     char filename[PATH_MAX];
--    const __DRIextension **extensions;
-+    char *get_extensions_name;
-+    const __DRIextension **extensions = NULL;
- 
-     snprintf(filename, sizeof filename, "%s/%s_dri.so",
-              dri_driver_path, driverName);
-@@ -231,7 +240,18 @@ glxProbeDriver(const char *driverName,
-         goto cleanup_failure;
-     }
- 
--    extensions = dlsym(driver, __DRI_DRIVER_EXTENSIONS);
-+    if (asprintf(&get_extensions_name, "%s_%s",
-+                 __DRI_DRIVER_GET_EXTENSIONS, driverName) != -1) {
-+        const __DRIextension **(*get_extensions)(void);
-+
-+        get_extensions = dlsym(driver, get_extensions_name);
-+        if (get_extensions)
-+            extensions = get_extensions();
-+        free(get_extensions_name);
-+    }
-+
-+    if (!extensions)
-+        extensions = dlsym(driver, __DRI_DRIVER_EXTENSIONS);
-     if (extensions == NULL) {
-         LogMessage(X_ERROR, "AIGLX error: %s exports no extensions (%s)\n",
-                    driverName, dlerror());
---
-cgit v0.9.0.2-2-gbebe