diff --git a/common/shlibs b/common/shlibs
index 6f9f14954a7..e51ee7d74ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1111,3 +1111,4 @@ libwayland-cursor.so.0 wayland-1.0.0_1
 libtomcrypt.so.0 libtomcrypt-1.117_1
 libOpenCL.so.1 libOpenCL-1.0_1
 libHX.so.28 libHX-3.14_1
+libxkbcommon.so.0 libxkbcommon-0.2.0_1
diff --git a/srcpkgs/libxkbcommon-devel b/srcpkgs/libxkbcommon-devel
new file mode 120000
index 00000000000..51911d5197a
--- /dev/null
+++ b/srcpkgs/libxkbcommon-devel
@@ -0,0 +1 @@
+libxkbcommon
\ No newline at end of file
diff --git a/srcpkgs/libxkbcommon/libxkbcommon-devel.template b/srcpkgs/libxkbcommon/libxkbcommon-devel.template
new file mode 100644
index 00000000000..a3be2292337
--- /dev/null
+++ b/srcpkgs/libxkbcommon/libxkbcommon-devel.template
@@ -0,0 +1,13 @@
+# Template file for 'libxkbcommon-devel'.
+#
+noarch=yes
+depends="${sourcepkg}-${version}_${revision}"
+short_desc="${short_desc} -- development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+}
diff --git a/srcpkgs/libxkbcommon/libxkbcommon.rshlibs b/srcpkgs/libxkbcommon/libxkbcommon.rshlibs
new file mode 100644
index 00000000000..631aa1dda40
--- /dev/null
+++ b/srcpkgs/libxkbcommon/libxkbcommon.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
new file mode 100644
index 00000000000..51813012316
--- /dev/null
+++ b/srcpkgs/libxkbcommon/template
@@ -0,0 +1,19 @@
+# Template file for 'libxkbcommon'.
+pkgname=libxkbcommon
+version=0.2.0
+revision=1
+build_style=gnu-configure
+configure_args="--disable-static"
+makedepends="pkg-config flex"
+subpackages="${pkgname}-devel"
+short_desc="Library to handle keyboard descriptions"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://xkbcommon.org/"
+license="MIT"
+distfiles="http://xkbcommon.org/download/${pkgname}-${version}.tar.bz2"
+checksum=74eb0a121ca3998015fd687591426bb15c524645a72cf602831b2e729172fb42
+long_desc="
+ xkbcommon is a library to handle keyboard descriptions, including loading
+ them from disk, parsing them and handling their state. It's mainly meant
+ for client toolkits, window systems, and other system applications;
+ currently that includes Wayland, kmscon, GTK+, Clutter, and more."