--- gdm/config/gdm
+++ gdm/config/gdm
@@ -1,8 +1,8 @@
 #%PAM-1.0
-auth       required	pam_env.so
-auth       required	pam_stack.so service=system-auth
-auth       required	pam_nologin.so
-account    required	pam_stack.so service=system-auth
-password   required	pam_stack.so service=system-auth
-session    required	pam_stack.so service=system-auth
-session    optional     pam_console.so
+auth		required	pam_shells.so
+auth		required	pam_succeed_if.so quiet uid ne 0
+auth		include		common-login
+account		include		common-login
+password	include		common-login
+session		substack	common-login
+session		optional	pam_console.so
--- gdm/config/gdm-autologin
+++ gdm/config/gdm-autologin
@@ -1,8 +1,7 @@
 #%PAM-1.0
-auth       required	pam_env.so
-auth       required	pam_nologin.so
-auth       required	pam_permit.so
-account    required	pam_stack.so service=system-auth
-password   required	pam_stack.so service=system-auth
-session    required	pam_stack.so service=system-auth
-session    optional     pam_console.so
+auth		required	pam_nologin.so
+auth		required	pam_permit.so
+account		include		common-login
+password	include		common-login
+session		substack	common-login
+session		optional	pam_console.so
--- gdm/utils/gdmsetup-pam
+++ gdm/utils/gdmsetup-pam
@@ -1,6 +1,6 @@
 #%PAM-1.0
-auth       sufficient   pam_rootok.so
-auth       required     pam_stack.so service=system-auth
-session    required     pam_permit.so
-session    optional     pam_xauth.so
-account    required     pam_permit.so
+auth	sufficient	pam_rootok.so
+auth	include		system-auth
+account	required	pam_permit.so
+session	required	pam_permit.so
+session	optional	pam_xauth.so