diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index ab4b6837ece..9a706d8c458 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
-version=1.14.5
+version=1.15.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
@@ -17,12 +17,13 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org"
 license="MIT/X11, BSD"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
-checksum=8d0f06bf1416487a5170318477088826a8d737d4a201e996b2dc1ecff47461d1
+checksum=613b2f2e7ee2a06d2f8e862c836dc70d319c52f1537749e027398f40086aabb8
 
 hostmakedepends="pkg-config perl flex"
-makedepends="libfl-devel damageproto inputproto>=2.2 glproto>=1.4.15 xproto>=7.0.22
+makedepends="libfl-devel damageproto inputproto>=2.2 glproto>=1.4.17 xproto>=7.0.25
  dri2proto>=2.1 xf86driproto randrproto videoproto compositeproto scrnsaverproto
- resourceproto>=1.2.0 xineramaproto xcmiscproto bigreqsproto libudev-devel>=183
+ resourceproto>=1.2.0 xineramaproto xcmiscproto bigreqsproto dri3proto presentproto
+ libxshmfence-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel libudev-devel>=183
  openssl-devel libX11-devel libXext-devel libdmx-devel libpciaccess-devel
  libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel
  libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel
@@ -84,12 +85,12 @@ xorg-server-xvfb_package() {
 }
 
 xorg-server-devel_package() {
-	depends="libudev-devel dri2proto>=2.1 glproto xf86driproto randrproto
+	depends="libudev-devel dri2proto>=2.1 dri3proto presentproto glproto xf86driproto randrproto
 		videoproto compositeproto scrnsaverproto resourceproto xineramaproto
 		libdmx-devel libXext-devel libX11-devel libpciaccess-devel libXfont-devel
 		libXau-devel pixman-devel libXdmcp-devel libXmu-devel libXrender-devel
 		libXfixes-devel libXi-devel libXaw-devel libXt-devel libXpm-devel
-		libdrm-devel>=2.4.34"
+		libxshmfence-devel libdrm-devel>=2.4.34"
 	if [ "$build_option_opengl" ]; then
 		depends+=" MesaLib-devel"
 	fi
@@ -103,7 +104,7 @@ xorg-server-devel_package() {
 
 xorg-server_package() {
 	# See hw/xfree86/common/xf86Module.h. Only care for the major version.
-	provides="xserver-abi-extension-7_1 xserver-abi-input-19_1 xserver-abi-video-14_1"
+	provides="xserver-abi-extension-8_1 xserver-abi-input-20_1 xserver-abi-video-15_1"
 	depends="xkeyboard-config"
 	pkg_install() {
 		vmove all