diff --git a/srcpkgs/libxcb/libxcb-devel.template b/srcpkgs/libxcb/libxcb-devel.template
index 56894a2bd2b..1e539cc3f19 100644
--- a/srcpkgs/libxcb/libxcb-devel.template
+++ b/srcpkgs/libxcb/libxcb-devel.template
@@ -2,10 +2,7 @@
 #
 noarch=yes
 depends="libXdmcp-devel libXau-devel libxcb>=${version}"
-short_desc="${sourcepkg} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
+short_desc="${short_desc} -- development files"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libxcb/template b/srcpkgs/libxcb/template
index 8841dd9173b..e788e735782 100644
--- a/srcpkgs/libxcb/template
+++ b/srcpkgs/libxcb/template
@@ -1,25 +1,24 @@
 # Template build file for 'libxcb'.
 pkgname=libxcb
 version=1.9
-revision=1
+revision=2
 subpackages="$pkgname-devel"
 build_style=gnu-configure
 configure_args="--disable-build-docs --disable-static"
-makedepends="pkg-config python libxslt docbook-xsl xcb-proto>=1.8 libXdmcp-devel libXau-devel"
+makedepends="pkg-config python libxslt docbook-xsl xcb-proto>=1.8
+ libXdmcp-devel libXau-devel"
+crossmakedepends="libXdmcp-devel libXau-devel"
 short_desc="X protocol C-language Binding"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://xcb.freedesktop.org"
 distfiles="$homepage/dist/$pkgname-$version.tar.bz2"
 checksum=8857e62b3aae2976c7e10043643e45a85964fd1dcb4469dfde0d04d3d1b12c96
-long_desc="
- The libxcb package provides a replacement for the current Xlib interface.
- Some of its advantages include:
-  - size: small library and lower memory footprint
-  - latency hiding: batch several requests and wait for the replies later
-  - direct protocol access: one-to-one mapping between interface and protocol
-  - proven thread support: transparently access XCB from multiple threads
-  - easy extension implementation: interfaces auto-generated from XML-XCB
 
- Xlib can also use XCB as a transport layer, allowing software to make
- requests and receive responses with both, which eases porting to XCB."
+if [ -n "$XBPS_CROSS_TRIPLET" ]; then
+	makedepends="automake ${makedepends}"
+	pre_configure() {
+		sed -e "s|pthread-stubs ||" -i configure.ac
+		autoreconf -fi
+	}
+fi