diff --git a/common/shlibs b/common/shlibs
index d977a3c5364..d68c7719c84 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1136,6 +1136,7 @@ libtomcrypt.so.0 libtomcrypt-1.17_1
 libOpenCL.so.1 libOpenCL-1.0_1
 libHX.so.28 libHX-3.14_1
 libxkbcommon.so.0 libxkbcommon-0.2.0_1
+libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1
 libgee-0.8.so.2 libgee08-0.8.2_1
 libnettle.so.4 nettle-2.5_1
 libhogweed.so.2 nettle-2.5_1
diff --git a/srcpkgs/libxkbcommon-x11 b/srcpkgs/libxkbcommon-x11
new file mode 120000
index 00000000000..51911d5197a
--- /dev/null
+++ b/srcpkgs/libxkbcommon-x11
@@ -0,0 +1 @@
+libxkbcommon
\ No newline at end of file
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 55de3fe86fd..337f8b341c7 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,21 +1,28 @@
 # Template file for 'libxkbcommon'.
 pkgname=libxkbcommon
-version=0.3.1
-revision=3
+version=0.4.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config flex"
-makedepends="xkeyboard-config"
+makedepends="xkeyboard-config libxcb-devel"
 depends="xkeyboard-config"
 short_desc="Library to handle keyboard descriptions"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xkbcommon.org/"
 license="MIT/X11"
 distfiles="http://xkbcommon.org/download/${pkgname}-${version}.tar.xz"
-checksum=9c973581bba0c883a301fa6474d9c3e4f3a06c34e4ae4f1f4e113692cb18b38e
+checksum=a0fc71b07eeddba4af62bd709e24cec219778bb6871384aa850b2f5798a48957
+
+libxkbcommon-x11_package() {
+	short_desc+=" - X11 support"
+	pkg_install() {
+		vmove usr/lib/*x11*.so.*
+	}
+}
 
 libxkbcommon-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="libxcb-devel ${sourcepkg}-x11>=${version}_${revision} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include