diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index c2aabf4cd81..7283e3785ca 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.16.1
+version=1.16.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
@@ -13,13 +13,14 @@ configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
  --enable-kdrive --enable-kdrive-evdev --enable-kdrive-kbd
  --enable-kdrive-mouse --enable-xorg --enable-xcsecurity
  --disable-linux-acpi --disable-linux-apm --enable-xwayland
- --enable-suid-wrapper --with-shared-memory-dir=/dev/shm"
+ --enable-suid-wrapper --with-shared-memory-dir=/dev/shm
+ $(vopt_enable systemd systemd-logind) $(vopt_with systemd systemd-daemon)"
 short_desc="The X11 server from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org"
 license="MIT/X11, BSD"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
-checksum=f4677c6ec9fb7b59648321737087aeb9963b60bcea50ee3773fe46be1a37e060
+checksum=446e0c3ebd556aced78ec0000ba9ae73f1e5317117d497f827afba48b787ce64
 
 lib32disabled=yes
 
@@ -41,13 +42,6 @@ provides="xserver-abi-extension-8_1 xserver-abi-input-21_1 xserver-abi-video-18_
 # Package build options
 build_options="systemd"
 
-if [ "$build_option_systemd" ]; then
-	configure_args+=" --enable-systemd-logind --with-systemd-daemon"
-	makedepends+=" dbus-devel systemd-devel"
-else
-	configure_args+=" --disable-systemd-logind --without-systemd-daemon"
-fi
-
 if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	# Enable glamor/dri/opengl by default on x86.
 	configure_args+=" --enable-glamor --enable-dri2 --enable-dri3 --enable-glx-tls --enable-glx"
@@ -91,7 +85,6 @@ xorg-server-xephyr_package() {
 		vmove usr/share/man/man1/Xephyr.1
 	}
 }
-
 xorg-server-xvfb_package() {
 	short_desc="Virtual framebuffer X server"
 	pkg_install() {
@@ -99,17 +92,8 @@ xorg-server-xvfb_package() {
 		vmove usr/share/man/man1/Xvfb.1
 	}
 }
-
 xorg-server-devel_package() {
-	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
-		libxshmfence-devel libdrm-devel>=2.4.34"
-	if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		depends+=" MesaLib-devel"
-	fi
+	depends="${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include