diff --git a/common/shlibs b/common/shlibs
index d4adb1f89d..5ba0766032 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -267,7 +267,8 @@ libXv.so.1 libXv-1.0.4_1
 libXvMC.so.1 libXvMC-1.0.4_1
 libXvMCW.so.1 libXvMC-1.0.4_1
 libxcb-render-util.so.0 xcb-util-0.3.4_1
-libxcb-icccm.so.1 xcb-util-0.3.4_1
+libxcb-icccm.so.4 xcb-util-wm-0.3.9_1
+libxcb-ewmh.so.2 xcb-util-wm-0.3.9_1
 libxcb-aux.so.0 xcb-util-0.3.4_1
 libxcb-image.so.0 xcb-util-image-0.3.9_1
 libxcb-reply.so.1 xcb-util-0.3.4_1
diff --git a/srcpkgs/xcb-util-wm-devel b/srcpkgs/xcb-util-wm-devel
new file mode 120000
index 0000000000..b60d4cc26d
--- /dev/null
+++ b/srcpkgs/xcb-util-wm-devel
@@ -0,0 +1 @@
+xcb-util-wm
\ No newline at end of file
diff --git a/srcpkgs/xcb-util-wm/template b/srcpkgs/xcb-util-wm/template
new file mode 100644
index 0000000000..c84b4b979e
--- /dev/null
+++ b/srcpkgs/xcb-util-wm/template
@@ -0,0 +1,18 @@
+# Template build for 'xcb-util-wm'.
+pkgname=xcb-util-wm
+version=0.3.9
+revision=1
+build_style=gnu-configure
+configure_args="--disable-static"
+makedepends="pkg-config libxcb-devel>=1.8 xcb-util-devel>=0.3.9"
+short_desc="Utility libraries for XC Binding - client and window-manager helpers for ICCCM"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://xcb.freedesktop.org"
+license="GPL-2"
+distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
+checksum=038f9bdb917b1f6d98a164f57dfb32212a102d771ab6f03de49fef3786746030
+long_desc="
+ This package provides client and window-manager helpers for ICCCM for XCB."
+
+subpackages="$pkgname-devel"
+replaces="xcb-util<0.3.9"
diff --git a/srcpkgs/xcb-util-wm/xcb-util-wm-devel.template b/srcpkgs/xcb-util-wm/xcb-util-wm-devel.template
new file mode 100644
index 0000000000..2ff8d70768
--- /dev/null
+++ b/srcpkgs/xcb-util-wm/xcb-util-wm-devel.template
@@ -0,0 +1,13 @@
+# Template file for 'xcb-util-wm-devel'.
+#
+noarch=yes
+depends="libxcb-devel xcb-util-wm>=${version}"
+short_desc="${sourcepkg} -- development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+}
diff --git a/srcpkgs/xcb-util-wm/xcb-util-wm.rshlibs b/srcpkgs/xcb-util-wm/xcb-util-wm.rshlibs
new file mode 100644
index 0000000000..6dd6b4d6fc
--- /dev/null
+++ b/srcpkgs/xcb-util-wm/xcb-util-wm.rshlibs
@@ -0,0 +1,2 @@
+libxcb.so.1
+libc.so.6