diff --git a/ChangeLog b/ChangeLog
index bd277facb..a28670feb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
  - (bal) Removed -L/usr/ucblib -R/usr/ucblib for Solaris platform.
  - (bal) Fixed OpenSSL rework to use $saved_*.  Patch by Tim Rice 
    <tim@multitalents.net>
+ - (bal) Reverted out of 2001/02/15 patch by djm below because it
+   breaks Solaris.
+	- (djm) Move PAM session setup back to before setuid to user.
+	  fixes problems on Solaris-drived PAMs.
 
 20010220
  - (bal) Fix mixed up params to memmove() from Jan 5th in setenv.c and
@@ -4083,4 +4087,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.807 2001/02/21 02:35:37 mouring Exp $
+$Id: ChangeLog,v 1.808 2001/02/21 05:53:33 mouring Exp $
diff --git a/session.c b/session.c
index e862c6504..de8127f79 100644
--- a/session.c
+++ b/session.c
@@ -1017,10 +1017,6 @@ do_child(const char *command, struct passwd * pw, const char *term,
 #endif /* WITH_IRIX_ARRAY */
 #endif /* WITH_IRIX_JOBS */
 
-#ifdef USE_PAM
-	do_pam_session(pw->pw_name, ttyname);
-	do_pam_setcred();
-#endif /* USE_PAM */
 
 	/* login(1) is only called if we execute the login shell */
 	if (options.use_login && command != NULL)
@@ -1147,6 +1143,11 @@ do_child(const char *command, struct passwd * pw, const char *term,
 	shell = login_getcapstr(lc, "shell", (char *)shell, (char *)shell);
 #endif
 
+#ifdef USE_PAM
+	do_pam_session(pw->pw_name, ttyname);
+	do_pam_setcred();
+#endif /* USE_PAM */
+
 #ifdef AFS
 	/* Try to get AFS tokens for the local cell. */
 	if (k_hasafs()) {