diff --git a/srcpkgs/libxcb/libxcb-devel.template b/srcpkgs/libxcb/libxcb-devel.template
index 1e539cc3f1..82bc984df6 100644
--- a/srcpkgs/libxcb/libxcb-devel.template
+++ b/srcpkgs/libxcb/libxcb-devel.template
@@ -1,6 +1,5 @@
 # Template file for 'libxcb-devel'.
 #
-noarch=yes
 depends="libXdmcp-devel libXau-devel libxcb>=${version}"
 short_desc="${short_desc} -- development files"
 
diff --git a/srcpkgs/libxcb/template b/srcpkgs/libxcb/template
index 6f4d939602..083f4c5d14 100644
--- a/srcpkgs/libxcb/template
+++ b/srcpkgs/libxcb/template
@@ -1,12 +1,12 @@
 # Template build file for 'libxcb'.
 pkgname=libxcb
 version=1.9
-revision=2
+revision=3
 subpackages="$pkgname-devel"
 build_style=gnu-configure
 configure_args="--disable-build-docs --disable-static"
-hostmakedepends="pkg-config python libxslt docbook-xsl"
-makedepends="xcb-proto>=1.8 libXdmcp-devel libXau-devel"
+hostmakedepends="pkg-config python libxslt docbook-xsl xcb-proto>=1.8"
+makedepends="libXdmcp-devel libXau-devel"
 short_desc="X protocol C-language Binding"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -15,7 +15,7 @@ distfiles="$homepage/dist/$pkgname-$version.tar.bz2"
 checksum=8857e62b3aae2976c7e10043643e45a85964fd1dcb4469dfde0d04d3d1b12c96
 
 if [ "$XBPS_CROSS_BUILD" ]; then
-	hostmakedepends="automake ${hostmakedepends}"
+	hostmakedepends+=" libtool automake "
 	pre_configure() {
 		sed -e "s|pthread-stubs ||" -i configure.ac
 		autoreconf -fi