diff --git a/templates/libxcb-devel b/templates/libxcb-devel
new file mode 120000
index 00000000000..1d23c93e8e4
--- /dev/null
+++ b/templates/libxcb-devel
@@ -0,0 +1 @@
+libxcb
\ No newline at end of file
diff --git a/templates/libxcb/build.diff b/templates/libxcb/build.diff
new file mode 100644
index 00000000000..da35dfc0864
--- /dev/null
+++ b/templates/libxcb/build.diff
@@ -0,0 +1,11 @@
+--- configure.orig	2009-04-16 23:17:47.331762217 +0200
++++ configure	2009-04-16 23:18:04.063768486 +0200
+@@ -21227,7 +21227,7 @@ else
+ echo "${ECHO_T}yes" >&6; }
+ 	:
+ fi
+-NEEDED="pthread-stubs xau >= 0.99.2"
++NEEDED="xau >= 0.99.2"
+ 
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for NEEDED" >&5
diff --git a/templates/libxcb/depends b/templates/libxcb/depends
new file mode 100644
index 00000000000..80ce1443c5b
--- /dev/null
+++ b/templates/libxcb/depends
@@ -0,0 +1,2 @@
+abi_depends=1.2
+api_depends=${abi_depends}
diff --git a/templates/libxcb/devel.template b/templates/libxcb/devel.template
new file mode 100644
index 00000000000..ce11cd2d7aa
--- /dev/null
+++ b/templates/libxcb/devel.template
@@ -0,0 +1,17 @@
+# Template file for 'libxcb-devel'.
+#
+short_desc="${sourcepkg} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libxcb
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+}
diff --git a/templates/libxcb/template b/templates/libxcb/template
new file mode 100644
index 00000000000..95b86b5d0da
--- /dev/null
+++ b/templates/libxcb/template
@@ -0,0 +1,29 @@
+# Template build file for 'libxcb'.
+pkgname=libxcb
+sourcepkg=$pkgname
+version=1.2
+distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--disable-build-docs --disable-doxygen"
+short_desc="X protocol C-language Binding"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=4fe14659ed0c5ceacec25ad6067a9521f85852280bc39c0375f5000ab133cb3f
+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."
+ 
+subpackages="devel"
+Add_dependency build pkg-config
+Add_dependency build python
+Add_dependency build libxslt
+Add_dependency full glibc
+Add_dependency full libXdmcp
+Add_dependency full libXau