diff --git a/srcpkgs/ConsoleKit/ConsoleKit-devel.template b/srcpkgs/ConsoleKit/ConsoleKit-devel.template
index da6523fed8..36d29e68c4 100644
--- a/srcpkgs/ConsoleKit/ConsoleKit-devel.template
+++ b/srcpkgs/ConsoleKit/ConsoleKit-devel.template
@@ -5,8 +5,15 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run ConsoleKit
+revision=1
+
+Add_dependency run libX11-devel
+Add_dependency run dbus-devel
+Add_dependency run glib-devel
+Add_dependency run pam-devel
 Add_dependency run polkit-devel
+Add_dependency run zlib-devel
+Add_dependency run ConsoleKit
 
 do_install()
 {
diff --git a/srcpkgs/ConsoleKit/ConsoleKit-x11.template b/srcpkgs/ConsoleKit/ConsoleKit-x11.template
index 642950c504..22039754c7 100644
--- a/srcpkgs/ConsoleKit/ConsoleKit-x11.template
+++ b/srcpkgs/ConsoleKit/ConsoleKit-x11.template
@@ -5,8 +5,12 @@ long_desc="${long_desc}
 
  This package contains some tools that require X libraries."
 
-Add_dependency run ConsoleKit
+revision=1
+
+Add_dependency run glibc
+Add_dependency run glib
 Add_dependency run libX11
+Add_dependency run ConsoleKit
 
 do_install()
 {
diff --git a/srcpkgs/ConsoleKit/template b/srcpkgs/ConsoleKit/template
index 1c737b742c..6a948cf151 100644
--- a/srcpkgs/ConsoleKit/template
+++ b/srcpkgs/ConsoleKit/template
@@ -1,6 +1,7 @@
 # Template file for 'ConsoleKit'
 pkgname=ConsoleKit
 version=0.4.1
+revision=1
 distfiles="http://www.freedesktop.org/software/$pkgname/dist/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-docbook-docs --enable-pam-module
@@ -14,15 +15,28 @@ long_desc="
  to changes of any of these items or of any of the metadata associated with
  them."
 
-conf_files="/etc/dbus-1/system.d/ConsoleKit.conf
- /etc/ConsoleKit/seats.d/00-primary.seat"
+conf_files="
+/etc/dbus-1/system.d/ConsoleKit.conf
+/etc/ConsoleKit/seats.d/00-primary.seat"
 
+skip_empty_dirs=yes
 subpackages="$pkgname-devel $pkgname-x11"
-Add_dependency full polkit
-Add_dependency full zlib
-Add_dependency build libX11
+
+Add_dependency run glibc
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+Add_dependency run glib
+Add_dependency run pam
+Add_dependency run polkit
+Add_dependency run zlib
 Add_dependency build pkg-config
 Add_dependency build xmlto
+Add_dependency build libX11-devel
+Add_dependency build dbus-devel
+Add_dependency build glib-devel
+Add_dependency build pam-devel
+Add_dependency build polkit-devel
+Add_dependency build zlib-devel
 
 post_install()
 {