diff --git a/srcpkgs/xfce4-session/files/org.freedesktop.consolekit.pkla b/srcpkgs/xfce4-session/files/org.freedesktop.consolekit.pkla
deleted file mode 100644
index 7f1d74ff674..00000000000
--- a/srcpkgs/xfce4-session/files/org.freedesktop.consolekit.pkla
+++ /dev/null
@@ -1,31 +0,0 @@
-[Local restart]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.restart
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local shutdown]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.stop
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local restart - multiple]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.restart-multiple-users
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local shutdown - multiple]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.stop-multiple-users
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
diff --git a/srcpkgs/xfce4-session/files/org.freedesktop.upower.pkla b/srcpkgs/xfce4-session/files/org.freedesktop.upower.pkla
deleted file mode 100644
index 52c74f8921d..00000000000
--- a/srcpkgs/xfce4-session/files/org.freedesktop.upower.pkla
+++ /dev/null
@@ -1,15 +0,0 @@
-[Local hibernate]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.upower.hibernate
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local suspend]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.upower.suspend
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 56541a46da9..86cebb28153 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,32 +1,21 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.10.0
-homepage="http://xfce.org"
-distfiles="http://archive.xfce.org/src/xfce/xfce4-session/4.10/$pkgname-$version.tar.bz2"
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --enable-libgnome-keyring"
-depends="ConsoleKit-x11 upower udisks hicolor-icon-theme desktop-file-utils"
-makedepends="pkg-config intltool libxfce4ui-devel gtk+-devel xfconf-devel dbus-glib-devel libwnck2-devel xfce4-panel-devel ConsoleKit-devel libgnome-keyring-devel iceauth"
-revision=1
+depends="upower udisks hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool libxfce4ui-devel gtk+-devel
+ xfconf-devel dbus-glib-devel libwnck2-devel xfce4-panel-devel
+ ConsoleKit-devel libgnome-keyring-devel iceauth"
 short_desc="Xfce session manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+homepage="http://xfce.org"
+distfiles="http://archive.xfce.org/src/xfce/xfce4-session/4.10/$pkgname-$version.tar.bz2"
 checksum=bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce
 long_desc="
  xfce4-session is the session manager for the Xfce desktop environment."
 
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml"
-
 subpackages="$pkgname-devel" 
-make_dirs="/etc/polkit-1/localauthority 0700 root root"
-
-
-
-
-post_install() {
-	install -dm755 ${DESTDIR}/etc/polkit-1/localauthority/50-local.d
-	install -m644 ${FILESDIR}/org.freedesktop.consolekit.pkla \
-		${DESTDIR}/etc/polkit-1/localauthority/50-local.d/
-	install -m644 ${FILESDIR}/org.freedesktop.upower.pkla \
-		${DESTDIR}/etc/polkit-1/localauthority/50-local.d/
-}
diff --git a/srcpkgs/xfce4-session/xfce4-session.rshlibs b/srcpkgs/xfce4-session/xfce4-session.rshlibs
index 93e27e3b56f..b585b319aef 100644
--- a/srcpkgs/xfce4-session/xfce4-session.rshlibs
+++ b/srcpkgs/xfce4-session/xfce4-session.rshlibs
@@ -1,28 +1,22 @@
-libxfce4ui-1.so.0
 libgtk-x11-2.0.so.0
+libxfce4util.so.6
 libgdk-x11-2.0.so.0
 libxfconf-0.so.2
 libgobject-2.0.so.0
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
+libxfce4ui-1.so.0
 libgdk_pixbuf-2.0.so.0
-libgmodule-2.0.so.0
+libpango-1.0.so.0
+libm.so.6
 libdbus-glib-1.so.2
-libdbus-1.so.3
+libgmodule-2.0.so.0
 libSM.so.6
 libICE.so.6
 libX11.so.6
 libwnck-1.so.22
 libatk-1.0.so.0
 libcairo.so.2
-libgio-2.0.so.0
-libpangoft2-1.0.so.0
-libpangocairo-1.0.so.0
-libpango-1.0.so.0
-libfreetype.so.6
-libfontconfig.so.1
-librt.so.1
-libxfce4util.so.6
-libm.so.6
+libdbus-1.so.3
 libgnome-keyring.so.0