diff --git a/ChangeLog b/ChangeLog
index f71cfb4de..48336987c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 20011028
  - (djm) Avoid bug in Solaris PAM libs
+ - (djm) Disconnect if no tty and PAM reports password expired
 
 20011027
  - (tim) [configure.ac] Fixes for ReliantUNIX (don't use libucb)
@@ -6777,4 +6778,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1622 2001/10/28 11:33:48 djm Exp $
+$Id: ChangeLog,v 1.1623 2001/10/28 11:34:52 djm Exp $
diff --git a/session.c b/session.c
index e9d8ceb73..10cefdb44 100644
--- a/session.c
+++ b/session.c
@@ -432,6 +432,9 @@ do_exec_no_pty(Session *s, const char *command)
 #if defined(USE_PAM)
 	do_pam_session(s->pw->pw_name, NULL);
 	do_pam_setcred(1);
+	if (is_pam_password_change_required())
+		packet_disconnect("Password change required but no "
+		    "TTY available");
 #endif /* USE_PAM */
 
 	/* Fork the child. */