diff --git a/util-linux-ng-60-raw.rules b/util-linux-60-raw.rules
similarity index 100%
rename from util-linux-ng-60-raw.rules
rename to util-linux-60-raw.rules
diff --git a/util-linux-ng-chsh-chfn.pamd b/util-linux-chsh-chfn.pamd
similarity index 100%
rename from util-linux-ng-chsh-chfn.pamd
rename to util-linux-chsh-chfn.pamd
diff --git a/util-linux-ng-login.pamd b/util-linux-login.pamd
similarity index 86%
rename from util-linux-ng-login.pamd
rename to util-linux-login.pamd
index 2c9a3a2..3c03927 100644
--- a/util-linux-ng-login.pamd
+++ b/util-linux-login.pamd
@@ -1,6 +1,7 @@
 #%PAM-1.0
 auth [user_unknown=ignore success=ok ignore=ignore default=bad] pam_securetty.so
-auth       include      system-auth
+auth       substack     system-auth
+auth       include      postlogin
 account    required     pam_nologin.so
 account    include      system-auth
 password   include      system-auth
@@ -13,4 +14,5 @@ session    required     pam_selinux.so open
 session    required     pam_namespace.so
 session    optional     pam_keyinit.so force revoke
 session    include      system-auth
+session    include      postlogin
 -session   optional     pam_ck_connector.so
diff --git a/util-linux-ng-remote.pamd b/util-linux-remote.pamd
similarity index 84%
rename from util-linux-ng-remote.pamd
rename to util-linux-remote.pamd
index d8f83f3..2f22cc2 100644
--- a/util-linux-ng-remote.pamd
+++ b/util-linux-remote.pamd
@@ -1,6 +1,7 @@
 #%PAM-1.0
 auth       required     pam_securetty.so
-auth       include      password-auth
+auth       substack     password-auth
+auth       include      postlogin
 account    required     pam_nologin.so
 account    include      password-auth
 password   include      password-auth
@@ -12,3 +13,4 @@ session    required     pam_selinux.so open
 session    required     pam_namespace.so
 session    optional     pam_keyinit.so force revoke
 session    include      password-auth
+session    include      postlogin
diff --git a/util-linux.spec b/util-linux.spec
index 2779987..9acd324 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux
 Version: 2.19
-Release: 0.5%{?dist}
+Release: 0.6%{?dist}
 License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux
@@ -34,10 +34,10 @@ BuildRequires: libutempter-devel
 
 ### Sources
 Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/util-linux-%{upstream_version}.tar.bz2
-Source1: util-linux-ng-login.pamd
-Source2: util-linux-ng-remote.pamd
-Source3: util-linux-ng-chsh-chfn.pamd
-Source4: util-linux-ng-60-raw.rules
+Source1: util-linux-login.pamd
+Source2: util-linux-remote.pamd
+Source3: util-linux-chsh-chfn.pamd
+Source4: util-linux-60-raw.rules
 Source5: mount.tmpfs
 Source8: nologin.c
 Source9: nologin.8
@@ -749,6 +749,9 @@ fi
 
 
 %changelog
+* Tue Feb  8 2011 Karel Zak <kzak@redhat.com> 2.19-0.6
+- fix #665062 - add support for the postlogin PAM stack to util-linux-ng
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.19-0.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild