diff --git a/srcpkgs/xfce4-session/depends b/srcpkgs/xfce4-session/depends
index f11fd7c513..79732def7d 100644
--- a/srcpkgs/xfce4-session/depends
+++ b/srcpkgs/xfce4-session/depends
@@ -1,2 +1,2 @@
-abi_depends=">=4.8.0"
+abi_depends=">=4.9.1"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 9935b0bd5e..81dcb77b74 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,21 +1,21 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
-version=4.8.1
-revision=4
-distfiles="http://archive.xfce.org/src/xfce/${pkgname}/4.8/$pkgname-$version.tar.bz2"
+version=4.9.1
+homepage="http://xfce.org"
+distfiles="http://archive.xfce.org/src/xfce/xfce4-session/4.9/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-configure_args="--disable-gnome --disable-libgnome-keyring --disable-hal
---enable-session-screenshots --enable-upower --enable-consolekit
---enable-polkit --enable-panel-plugin --disable-debug --disable-static"
+configure_args="--disable-static --enable-libgnome-keyring"
 short_desc="Xfce session manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=1df52a77d87ed4d27b4f40a2f03a0b6334422d64bdc4e31b9aac22e25e68b829
+license="GPL-2"
+checksum=2d96db718ec4521d9fe2e82223a50a64788cbc0cf2c8b213e7f52ebbec657e81
 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"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel" 
+make_dirs="/etc/polkit-1/localauthority 0700 root root"
 
 Add_dependency run ConsoleKit-x11
 
@@ -28,16 +28,15 @@ Add_dependency build dbus-glib-devel
 Add_dependency build libwnck2-devel
 Add_dependency build xfce4-panel-devel
 Add_dependency build ConsoleKit-devel
+Add_dependency build libgnome-keyring-devel
 Add_dependency build iceauth
 
-Add_dependency full upower
-Add_dependency full udisks
-Add_dependency full hicolor-icon-theme
-Add_dependency full desktop-file-utils
+Add_dependency run upower
+Add_dependency run udisks
+Add_dependency run hicolor-icon-theme
+Add_dependency run desktop-file-utils
 
-post_install()
-{
-	install -dm700 ${DESTDIR}/etc/polkit-1/localauthority
+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/
diff --git a/srcpkgs/xfce4-session/xfce4-session-devel.template b/srcpkgs/xfce4-session/xfce4-session-devel.template
index 158e2c5e51..1f20a1704c 100644
--- a/srcpkgs/xfce4-session/xfce4-session-devel.template
+++ b/srcpkgs/xfce4-session/xfce4-session-devel.template
@@ -5,19 +5,13 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run libxfce4ui-devel
-Add_dependency run gtk+-devel
 Add_dependency run xfconf-devel
-Add_dependency run dbus-glib-devel
-Add_dependency run libwnck2-devel
-Add_dependency run xfce4-panel-devel
-Add_dependency run xfce4-session
+Add_dependency run xfce4-session ">=${version}"
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+noarch=yes
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/xfce4-session/xfce4-session.rshlibs b/srcpkgs/xfce4-session/xfce4-session.rshlibs
index b2666f2a16..93e27e3b56 100644
--- a/srcpkgs/xfce4-session/xfce4-session.rshlibs
+++ b/srcpkgs/xfce4-session/xfce4-session.rshlibs
@@ -1,6 +1,5 @@
 libxfce4ui-1.so.0
 libgtk-x11-2.0.so.0
-libxfce4util.so.4
 libgdk-x11-2.0.so.0
 libxfconf-0.so.2
 libgobject-2.0.so.0
@@ -17,12 +16,13 @@ libX11.so.6
 libwnck-1.so.22
 libatk-1.0.so.0
 libcairo.so.2
-libxfce4panel-1.0.so.3
 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
-libgthread-2.0.so.0
 librt.so.1
+libxfce4util.so.6
+libm.so.6
+libgnome-keyring.so.0