diff --git a/srcpkgs/xf86-input-libinput-devel b/srcpkgs/xf86-input-libinput-devel
new file mode 120000
index 00000000000..cec3cb0f28c
--- /dev/null
+++ b/srcpkgs/xf86-input-libinput-devel
@@ -0,0 +1 @@
+xf86-input-libinput
\ No newline at end of file
diff --git a/srcpkgs/xf86-input-libinput/files/90-libinput.conf b/srcpkgs/xf86-input-libinput/files/90-libinput.conf
new file mode 100644
index 00000000000..818b3050d1e
--- /dev/null
+++ b/srcpkgs/xf86-input-libinput/files/90-libinput.conf
@@ -0,0 +1,30 @@
+# Match on all types of devices but tablet devices and joysticks
+
+Section "InputClass"
+        Identifier "libinput pointer catchall"
+        MatchIsPointer "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "libinput"
+EndSection
+
+Section "InputClass"
+        Identifier "libinput keyboard catchall"
+        MatchIsKeyboard "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "libinput"
+EndSection
+
+Section "InputClass"
+        Identifier "libinput touchpad catchall"
+        MatchIsTouchpad "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "libinput"
+EndSection
+
+Section "InputClass"
+        Identifier "libinput touchscreen catchall"
+        MatchIsTouchscreen "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "libinput"
+EndSection
+
diff --git a/srcpkgs/xf86-input-libinput/template b/srcpkgs/xf86-input-libinput/template
new file mode 100644
index 00000000000..9e1cfc5522c
--- /dev/null
+++ b/srcpkgs/xf86-input-libinput/template
@@ -0,0 +1,30 @@
+# Template build file for 'xf86-input-libinput'.
+pkgname=xf86-input-libinput
+version=0.6.0
+revision=1
+lib32disabled=yes
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="xorg-server-devel>=1.17<1.18 libinput-devel>=0.10"
+depends="virtual?xserver-abi-input-21_1"
+short_desc="Generic input driver for the X.Org server based on libinput"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://xorg.freedesktop.org/"
+license="MIT"
+distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
+checksum=2f29be1ed7f9b9c597b6f5c6ef24c37a244a0ba87ccd1c2586ffa4d08452ad79
+
+post_install() {
+	vinstall ${FILESDIR}/90-libinput 644 usr/share/X11/xorg.conf.d
+	vlicense COPYING
+}
+
+xf86-input-libinput-devel_package() {
+	lib32disabled=yes
+	depends="${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}