diff --git a/baselibs.conf b/baselibs.conf
index 98e399d..5577937 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -17,6 +17,7 @@ libxcb-sync0
 libxcb-xevie0
 libxcb-xf86dri0
 libxcb-xfixes0
+libxcb-xkb0
 libxcb-xinerama0
 libxcb-xprint0
 libxcb-xtest0
@@ -41,6 +42,7 @@ libxcb-devel
 	requires "libxcb-xevie0-<targettype> = <version>"
 	requires "libxcb-xf86dri0-<targettype> = <version>"
 	requires "libxcb-xfixes0-<targettype> = <version>"
+	requires "libxcb-xkb0-<targettype> = <version>"
 	requires "libxcb-xinerama0-<targettype> = <version>"
 	requires "libxcb-xprint0-<targettype> = <version>"
 	requires "libxcb-xtest0-<targettype> = <version>"
diff --git a/libxcb.changes b/libxcb.changes
index bf7d336..4a41e6e 100644
--- a/libxcb.changes
+++ b/libxcb.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 23 20:12:20 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Enable xcb-xkb extension (can be used by Weston/Wayland and Qt5,
+  and also upstream will build it by default in next release)
+
 -------------------------------------------------------------------
 Sat Jun  1 19:42:02 UTC 2013 - tobias.johannes.klausmann@mni.thm.de
 
diff --git a/libxcb.spec b/libxcb.spec
index 5fa4857..2c43206 100644
--- a/libxcb.spec
+++ b/libxcb.spec
@@ -244,6 +244,18 @@ protocol, improved threading support, and extensibility.
 The X Fixes extension provides applications with work-arounds for
 various limitations in the core protocol.
 
+%package -n libxcb-xkb0
+Summary:        X11 Keyboard Extension C library
+Group:          System/Libraries
+
+%description -n libxcb-xkb0
+The X protocol C-language Binding (XCB) is a replacement for Xlib
+featuring a small footprint, latency hiding, direct access to the
+protocol, improved threading support, and extensibility.
+
+Xkb extends the ability to control the keyboard
+over what is offered by the X Window System core protocol.
+
 %package -n libxcb-xinerama0
 Summary:        X11 Xinerama Extension C library
 Group:          System/Libraries
@@ -331,6 +343,7 @@ Requires:       libxcb-xevie0 = %version
 Requires:       libxcb-xf86dri0 = %version
 Requires:       libxcb-xfixes0 = %version
 Requires:       libxcb-xinerama0 = %version
+Requires:       libxcb-xkb0 = %version
 Requires:       libxcb-xprint0 = %version
 Requires:       libxcb-xtest0 = %version
 Requires:       libxcb-xv0 = %version
@@ -352,7 +365,7 @@ in %lname.
 %patch -P 1 -p0
 
 %build
-%configure --docdir=%_docdir/%name --disable-static
+%configure --docdir=%_docdir/%name --disable-static --enable-xkb
 make %{?_smp_mflags}
 
 %install
@@ -427,6 +440,10 @@ rm -f "%buildroot/%_libdir"/*.la
 
 %postun -n libxcb-xfixes0 -p /sbin/ldconfig
 
+%post   -n libxcb-xkb0 -p /sbin/ldconfig
+
+%postun -n libxcb-xkb0 -p /sbin/ldconfig
+
 %post   -n libxcb-xinerama0 -p /sbin/ldconfig
 
 %postun -n libxcb-xinerama0 -p /sbin/ldconfig
@@ -515,6 +532,9 @@ rm -f "%buildroot/%_libdir"/*.la
 %defattr(-,root,root)
 %_libdir/libxcb-xfixes.so.*
 
+%files -n libxcb-xkb0
+%_libdir/libxcb-xkb.so.0*
+
 %files -n libxcb-xinerama0
 %defattr(-,root,root)
 %_libdir/libxcb-xinerama.so.0*