diff --git a/srcpkgs/compiz/compiz-devel.template b/srcpkgs/compiz/compiz-devel.template
index 42f359aecb7..ff737b9e296 100644
--- a/srcpkgs/compiz/compiz-devel.template
+++ b/srcpkgs/compiz/compiz-devel.template
@@ -5,14 +5,37 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc-devel
-Add_dependency run gtk+-devel
-Add_dependency run libwnck-devel
-Add_dependency run dbus-glib-devel
+revision=1
+
+Add_dependency run pkg-config
+Add_dependency run libXcomposite-devel
+Add_dependency run libXdamage-devel
+Add_dependency run libXfixes-devel
+Add_dependency run libXrandr-devel
+Add_dependency run libXinerama-devel
+Add_dependency run libSM-devel
+Add_dependency run libICE-devel
 Add_dependency run libxslt-devel
-Add_dependency run librsvg-devel
-Add_dependency run MesaLib-devel
+Add_dependency run zlib-devel
+Add_dependency run libxml2-devel
 Add_dependency run startup-notification-devel
+Add_dependency run MesaLib-devel
+Add_dependency run glibc-devel
+Add_dependency run libX11-devel
+Add_dependency run libXext-devel
+Add_dependency run libXrender-devel
+Add_dependency run libwnck-devel
+Add_dependency run gtk+-devel
+Add_dependency run atk-devel
+Add_dependency run glib-devel
+Add_dependency run pango-devel
+Add_dependency run freetype-devel
+Add_dependency run fontconfig-devel
+Add_dependency run cairo-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run dbus-devel
+Add_dependency run librsvg-devel
+Add_dependency run libpng-devel
 Add_dependency run fuse-devel
 Add_dependency run compiz
 
diff --git a/srcpkgs/compiz/template b/srcpkgs/compiz/template
index 180415893d9..144c3dbf1f9 100644
--- a/srcpkgs/compiz/template
+++ b/srcpkgs/compiz/template
@@ -1,6 +1,7 @@
 # Template file for 'compiz'
 pkgname=compiz
 version=0.8.4
+revision=1
 distfiles="http://releases.compiz.org/$version/compiz-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--disable-gconf --disable-schemas-install
@@ -14,22 +15,64 @@ long_desc="
  via OpenGL. It provides various new graphical effects and features on
  any desktop environment, including Gnome and KDE."
 
-subpackages="$pkgname-devel"  
-Add_dependency run glibc
-Add_dependency run gtk+
-Add_dependency run libwnck
-Add_dependency run dbus-glib
+subpackages="$pkgname-devel"
+Add_dependency run libXcomposite
+Add_dependency run libXdamage
+Add_dependency run libXfixes
+Add_dependency run libXrandr
+Add_dependency run libXinerama
+Add_dependency run libSM
+Add_dependency run libICE
 Add_dependency run libxslt
-Add_dependency run librsvg
-Add_dependency run MesaLib
+Add_dependency run zlib
+Add_dependency run libxml2
 Add_dependency run startup-notification
+Add_dependency run MesaLib
+Add_dependency run glibc
+Add_dependency run libX11
+Add_dependency run libXext
+Add_dependency run libXrender
+Add_dependency run libwnck
+Add_dependency run gtk+
+Add_dependency run atk
+Add_dependency run glib
+Add_dependency run pango
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run cairo
+Add_dependency run dbus-glib
+Add_dependency run dbus-libs
+Add_dependency run librsvg
+Add_dependency run libpng
 Add_dependency run fuse
+Add_dependency build pkg-config 
 Add_dependency build intltool
-Add_dependency build gtk+-devel
-Add_dependency build libwnck-devel
-Add_dependency build dbus-glib-devel
+Add_dependency build libXcomposite-devel
+Add_dependency build libXdamage-devel
+Add_dependency build libXfixes-devel
+Add_dependency build libXrandr-devel
+Add_dependency build libXinerama-devel
+Add_dependency build libSM-devel
+Add_dependency build libICE-devel
 Add_dependency build libxslt-devel
-Add_dependency build librsvg-devel
-Add_dependency build MesaLib-devel
+Add_dependency build zlib-devel
+Add_dependency build libxml2-devel
 Add_dependency build startup-notification-devel
+Add_dependency build MesaLib-devel
+Add_dependency build glibc-devel
+Add_dependency build libX11-devel
+Add_dependency build libXext-devel
+Add_dependency build libXrender-devel
+Add_dependency build libwnck-devel
+Add_dependency build gtk+-devel
+Add_dependency build atk-devel
+Add_dependency build glib-devel
+Add_dependency build pango-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build cairo-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build dbus-devel
+Add_dependency build librsvg-devel
+Add_dependency build libpng-devel
 Add_dependency build fuse-devel