diff --git a/srcpkgs/lightdm/files/xsession b/srcpkgs/lightdm/files/xsession
index 5da041e6d7e..589dc704c0c 100644
--- a/srcpkgs/lightdm/files/xsession
+++ b/srcpkgs/lightdm/files/xsession
@@ -52,18 +52,6 @@ if [ -d "$xinitdir" ]; then
     done
 fi
 
-# Load Xsession scripts
-xsessionddir="/etc/X11/Xsession.d"
-if [ -d "$xsessionddir" ]; then
-    for i in `ls $xsessionddir`; do
-        script="$xsessionddir/$i"
-        echo "Loading X session script $script"
-        if [ -r "$script"  -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
-            . "$script"
-        fi
-    done
-fi
-
 echo "X session wrapper complete, running session $@"
 
 exec $@
diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template
index cd750fe0356..311e18a6f3b 100644
--- a/srcpkgs/lightdm/template
+++ b/srcpkgs/lightdm/template
@@ -1,7 +1,7 @@
 # Template file for 'lightdm'
 pkgname=lightdm
 version=1.8.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-greeter-session=lightdm-gtk-greeter
  --with-greeter-user=lightdm --disable-static --disable-tests"
@@ -22,8 +22,8 @@ long_desc="
 hostmakedepends="pkg-config intltool itstool gobject-introspection which"
 makedepends="dbus-glib-devel libxklavier-devel libxml2-devel
  qt-devel gtk+3-devel libxcb-devel libXdmcp-devel pam-devel vala-devel
- libgcrypt-devel gnome-icon-theme dbus"
-depends="gnome-icon-theme dbus accountsservice upower"
+ libgcrypt-devel gnome-icon-theme dbus accountsservice-devel"
+depends="gnome-icon-theme dbus accountsservice"
 conf_files="
 	/etc/lightdm/keys.conf
 	/etc/lightdm/lightdm.conf