diff --git a/srcpkgs/libxcb/libxcb-devel.template b/srcpkgs/libxcb/libxcb-devel.template
index f7d85a073d5..56894a2bd2b 100644
--- a/srcpkgs/libxcb/libxcb-devel.template
+++ b/srcpkgs/libxcb/libxcb-devel.template
@@ -1,15 +1,14 @@
 # Template file for 'libxcb-devel'.
 #
-depends="libXdmcp-devel libXau-devel libxcb"
+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."
 
-
 do_install() {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/{share,include} ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	vmove usr/include usr
+	vmove usr/share usr
+	vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/libxcb/template b/srcpkgs/libxcb/template
index e78dc63deef..8841dd9173b 100644
--- a/srcpkgs/libxcb/template
+++ b/srcpkgs/libxcb/template
@@ -1,16 +1,17 @@
 # Template build file for 'libxcb'.
 pkgname=libxcb
-version=1.8.1
-homepage="http://xcb.freedesktop.org"
-distfiles="$homepage/dist/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
-configure_args="--disable-build-docs"
-makedepends="pkg-config python libxslt docbook-xsl xcb-proto>=1.7 libXdmcp-devel libXau-devel"
+version=1.9
 revision=1
+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"
 short_desc="X protocol C-language Binding"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
-checksum=d2f46811e950710e7e79e45615d24f2c7ec318b9de9dc717972723da58bffa0d
+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:
@@ -22,5 +23,3 @@ long_desc="
 
  Xlib can also use XCB as a transport layer, allowing software to make
  requests and receive responses with both, which eases porting to XCB."
- 
-subpackages="$pkgname-devel"