diff --git a/srcpkgs/lightdm/files/lightdm-autologin.pam b/srcpkgs/lightdm/files/lightdm-autologin.pam
index 3d4389cf0ff..b95b66d1a22 100644
--- a/srcpkgs/lightdm/files/lightdm-autologin.pam
+++ b/srcpkgs/lightdm/files/lightdm-autologin.pam
@@ -1,13 +1,20 @@
 #%PAM-1.0
-auth requisite pam_nologin.so
-auth required pam_env.so
-auth requisite pam_permit.so
-auth sufficient pam_succeed_if.so uid >= 1000 quiet
-auth required pam_deny.so
-account required pam_unix.so
-password required pam_deny.so
-session required pam_loginuid.so
--session optional pam_systemd.so
-session optional pam_keyinit.so revoke
-session required pam_limits.so
-session required pam_unix.so
\ No newline at end of file
+auth            requisite       pam_nologin.so
+auth            required        pam_env.so
+
+auth            requisite       pam_permit.so
+
+auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
+auth            required        pam_deny.so
+
+account         required        pam_access.so
+account         required        pam_time.so
+account         required        pam_unix.so
+
+password        required        pam_deny.so
+
+session         required        pam_loginuid.so
+session         optional        pam_systemd.so
+session         optional        pam_keyinit.so revoke
+session         required        pam_limits.so
+session         required        pam_unix.so
diff --git a/srcpkgs/lightdm/files/lightdm.pam b/srcpkgs/lightdm/files/lightdm.pam
index d877644da5f..9ccf0d8d1b2 100644
--- a/srcpkgs/lightdm/files/lightdm.pam
+++ b/srcpkgs/lightdm/files/lightdm.pam
@@ -1,11 +1,12 @@
 #%PAM-1.0
-auth requisite pam_nologin.so
-auth required pam_env.so
-auth required pam_unix.so
-auth optional pam_gnome_keyring.so
-account required pam_unix.so
-session required pam_limits.so
-session required pam_unix.so
-session optional pam_systemd.so
-password required pam_unix.so
-session optional pam_gnome_keyring.so auto_start
+auth		requisite	pam_nologin.so
+auth		required	pam_env.so
+auth		required	pam_unix.so
+-auth		optional	pam_gnome_keyring.so
+account 	required	pam_unix.so
+session 	required	pam_limits.so
+session 	required	pam_unix.so
+password	required	pam_unix.so
+session 	optional	pam_loginuid.so
+session 	optional	pam_systemd.so
+-session	optional	pam_gnome_keyring.so auto_start
diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template
index 80134fbeff9..8f08c4fcd8d 100644
--- a/srcpkgs/lightdm/template
+++ b/srcpkgs/lightdm/template
@@ -1,14 +1,10 @@
 # Template file for 'lightdm'
 pkgname=lightdm
 version=1.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-greeter-session=lightdm-gtk-greeter
  --with-greeter-user=lightdm --disable-static --disable-tests"
-depends="accountsservice"
-makedepends="pkg-config intltool dbus-glib-devel libxklavier-devel libxml2-devel
- qt-devel gtk+3-devel libxcb-devel libXdmcp-devel pam-devel vala-devel
- gobject-introspection itstool"
 fulldepends="gnome-icon-theme dbus"
 short_desc="Light Display Manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -24,6 +20,11 @@ long_desc="
   * Fully themeable (easiest with the webkit interface)
   * Cross-desktop (greeters can be written in any toolkit)"
 
+depends="accountsservice upower"
+makedepends="pkg-config intltool dbus-glib-devel libxklavier-devel libxml2-devel
+ qt-devel gtk+3-devel libxcb-devel libXdmcp-devel pam-devel vala-devel
+ gobject-introspection itstool"
+
 conf_files="
 /etc/lightdm/keys.conf
 /etc/lightdm/lightdm.conf