diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index a7b665d..a533676 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -8,6 +8,7 @@ arch=('any')
 url="https://www.archlinux.org"
 license=('GPL')
 source=('system-auth'
+        'system-auth-substack'
         'system-local-login'
         'system-login'
         'system-remote-login'
@@ -19,9 +20,10 @@ backup=('etc/pam.d/system-auth'
         'etc/pam.d/system-remote-login'
         'etc/pam.d/system-services'
         'etc/pam.d/other')
-sha256sums=('3eb67872e436817ec97c4f3795adba2cf1d3829ea4e107ef5747569e4eeb5746'
+sha256sums=('9d1b4352738bf83371c3c9f2c9e82c2ed33d71d16cf7b391c9ef2b8485eb4aba'
+            '9d57d1820187ee3a2634056c72e9c0806a4951f012eb83825c2f579876cdbcf4'
             '005736b9bd650ff5e5d82a7e288853776d5bb8c90185d5774c07231c1e1c64a9'
-            '7ed354fca93af277cb139a7b98be985d573c6a5e5585528b0e76b9a401e59749'
+            '2ed270c2789526336cc6479e63f6263b5c6f41cfc829a17a449a38621b6bf020'
             '005736b9bd650ff5e5d82a7e288853776d5bb8c90185d5774c07231c1e1c64a9'
             '6eb1acdd3fa9f71a7f93fbd529be57ea65bcafc6e3a98a06af4d88013fc6a567'
             'd5ed59ec2157c19c87964a162f7ca84d53c19fb2bd68d3fbc1671ba8d906346f')
diff --git a/trunk/system-auth b/trunk/system-auth
index 2645043..3716850 100644
--- a/trunk/system-auth
+++ b/trunk/system-auth
@@ -1,16 +1,19 @@
 #%PAM-1.0
 
-auth      required  pam_unix.so     try_first_pass nullok
-auth      optional  pam_permit.so
+auth      required  pam_faillock.so       preauth
+# Optionally use requisite above if you do not want to prompt for the password
+# on locked accounts.
+auth      substack  system-auth-substack
 auth      required  pam_env.so
+auth      required  pam_faillock.so       authsucc
+# If you drop the above call to pam_faillock.so the lock will be done also
+# on non-consecutive authentication failures.
 
-account   required  pam_unix.so
-account   optional  pam_permit.so
+account   substack  system-auth-substack
 account   required  pam_time.so
 
-password  required  pam_unix.so     try_first_pass nullok sha512 shadow
-password  optional  pam_permit.so
+password  substack  system-auth-substack
 
 session   required  pam_limits.so
+-session  optional  pam_systemd_home.so
 session   required  pam_unix.so
-session   optional  pam_permit.so
diff --git a/trunk/system-auth-substack b/trunk/system-auth-substack
new file mode 100644
index 0000000..c104862
--- /dev/null
+++ b/trunk/system-auth-substack
@@ -0,0 +1,13 @@
+#%PAM-1.0
+
+auth      sufficient     pam_unix.so          try_first_pass nullok
+-auth     sufficient     pam_systemd_home.so
+auth      [default=die]  pam_faillock.so      authfail
+
+-account   sufficient    pam_systemd_home.so
+account    sufficient    pam_unix.so
+account    required      pam_deny.so
+
+password   sufficient    pam_unix.so          try_first_pass nullok shadow
+-password  sufficient    pam_systemd_home.so
+password   required      pam_deny.so
diff --git a/trunk/system-login b/trunk/system-login
index 9188a1c..80eed54 100644
--- a/trunk/system-login
+++ b/trunk/system-login
@@ -1,11 +1,9 @@
 #%PAM-1.0
 
-auth       required   pam_faillock.so        onerr=succeed file=/var/log/tallylog
 auth       required   pam_shells.so
 auth       requisite  pam_nologin.so
 auth       include    system-auth
 
-account    required   pam_faillock.so 
 account    required   pam_access.so
 account    required   pam_nologin.so
 account    include    system-auth
@@ -18,4 +16,4 @@ session    include    system-auth
 session    optional   pam_motd.so          motd=/etc/motd
 session    optional   pam_mail.so          dir=/var/spool/mail standard quiet
 -session   optional   pam_systemd.so
-session    required   pam_env.so
+session    required   pam_env.so           user_readenv=1