diff --git a/srcpkgs/xf86-input-evdev/template b/srcpkgs/xf86-input-evdev/template
index 0be0bea0b58..7b8c9987f6e 100644
--- a/srcpkgs/xf86-input-evdev/template
+++ b/srcpkgs/xf86-input-evdev/template
@@ -1,12 +1,12 @@
 # Template build file for 'xf86-input-evdev'.
 pkgname=xf86-input-evdev
 version=2.10.0
-revision=2
+revision=3
 lib32disabled=yes
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorg-server-devel mtdev-devel libevdev-devel"
-depends="virtual?xserver-abi-input-21_1"
+depends="virtual?xserver-abi-input-22_1"
 short_desc="Xorg event device input driver"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://xorg.freedesktop.org/"
diff --git a/srcpkgs/xf86-input-joystick/template b/srcpkgs/xf86-input-joystick/template
index 1a19ad1ff86..662f9929a32 100644
--- a/srcpkgs/xf86-input-joystick/template
+++ b/srcpkgs/xf86-input-joystick/template
@@ -1,12 +1,12 @@
 # Template build file for 'xf86-input-joystick'.
 pkgname=xf86-input-joystick
 version=1.6.2
-revision=6
+revision=7
 lib32disabled=yes
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorg-server-devel"
-depends="virtual?xserver-abi-input-21_1"
+depends="virtual?xserver-abi-input-22_1"
 short_desc="Joystick Input driver for Xorg"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://xorg.freedesktop.org/"
@@ -15,7 +15,7 @@ distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
 checksum=ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d
 
 post_install() {
-	vinstall ${FILESDIR}/50-joystick.conf 644 etc/X11/xorg.conf.d
+	vinstall ${FILESDIR}/50-joystick.conf 644 usr/share/X11/xorg.conf.d
 }
 
 xf86-input-joystick-devel_package() {
diff --git a/srcpkgs/xf86-input-libinput/template b/srcpkgs/xf86-input-libinput/template
index 439f8679f08..88ce0cdf803 100644
--- a/srcpkgs/xf86-input-libinput/template
+++ b/srcpkgs/xf86-input-libinput/template
@@ -1,12 +1,12 @@
 # Template build file for 'xf86-input-libinput'.
 pkgname=xf86-input-libinput
 version=0.15.0
-revision=1
+revision=2
 lib32disabled=yes
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorg-server-devel libinput-devel"
-depends="virtual?xserver-abi-input-21_1"
+depends="virtual?xserver-abi-input-22_1"
 short_desc="Generic input driver for the X.Org server based on libinput"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://xorg.freedesktop.org/"
diff --git a/srcpkgs/xf86-input-synaptics/template b/srcpkgs/xf86-input-synaptics/template
index 2410caded01..d359bca52cb 100644
--- a/srcpkgs/xf86-input-synaptics/template
+++ b/srcpkgs/xf86-input-synaptics/template
@@ -1,13 +1,13 @@
 # Template build file for 'xf86-input-synaptics'.
 pkgname=xf86-input-synaptics
 version=1.8.3
-revision=1
+revision=2
 lib32disabled=yes
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXtst-devel libevdev-devel
  pixman-devel libpciaccess-devel xorg-server-devel"
-depends="virtual?xserver-abi-input-21_1"
+depends="virtual?xserver-abi-input-22_1"
 short_desc="Xorg synaptics touchpad input driver"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.x.org/"
diff --git a/srcpkgs/xf86-input-vmmouse/template b/srcpkgs/xf86-input-vmmouse/template
index 6b4e6d5652f..aa6941101af 100644
--- a/srcpkgs/xf86-input-vmmouse/template
+++ b/srcpkgs/xf86-input-vmmouse/template
@@ -1,12 +1,12 @@
 # Template build file for 'xf86-input-vmmouse'.
 pkgname=xf86-input-vmmouse
 version=13.1.0
-revision=1
+revision=2
 lib32disabled=yes
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorg-server-devel"
-depends="virtual?xserver-abi-input-21_1"
+depends="virtual?xserver-abi-input-22_1"
 short_desc="Xorg VMware virtual mouse input driver"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://xorg.freedesktop.org"
diff --git a/srcpkgs/xf86-input-wacom/template b/srcpkgs/xf86-input-wacom/template
index 84cfca27f74..9cddb2f7c54 100644
--- a/srcpkgs/xf86-input-wacom/template
+++ b/srcpkgs/xf86-input-wacom/template
@@ -1,13 +1,13 @@
 # Template file for 'xf86-input-wacom'
 pkgname=xf86-input-wacom
 version=0.31.0
-revision=3
+revision=4
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--without-systemd-unit-dir --without-udev-rules-dir"
 hostmakedepends="pkg-config"
 makedepends="xorg-server-devel libXrandr-devel libXinerama-devel libXi-devel"
-depends="virtual?xserver-abi-input-21_1"
+depends="virtual?xserver-abi-input-22_1"
 short_desc="Xorg Wacom tablet input driver"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://xorg.freedesktop.org"