diff --git a/ChangeLog b/ChangeLog
index eb9a6ebea..a2c408552 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,8 @@
      djm owes me a vb and a tism cd for breaking ssh compilation
  - (dtucker) [auth-pam.c] malloc+memset -> calloc.  Patch from
    ldv at altlinux.org.
+ - (dtucker) [auth-pam.c] Return empty string if fgets fails in
+   sshpam_tty_conv.  Patch from ldv at altlinux.org.
 
 20070509
  - (tim) [configure.ac] Bug #1287: Add missing test for ucred.h.
@@ -2938,4 +2940,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4669 2007/05/20 05:20:08 dtucker Exp $
+$Id: ChangeLog,v 1.4670 2007/05/20 05:26:07 dtucker Exp $
diff --git a/auth-pam.c b/auth-pam.c
index bfd8f3270..35aecbdb4 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -984,7 +984,8 @@ sshpam_tty_conv(int n, sshpam_const struct pam_message **msg,
 			break;
 		case PAM_PROMPT_ECHO_ON:
 			fprintf(stderr, "%s\n", PAM_MSG_MEMBER(msg, i, msg));
-			fgets(input, sizeof input, stdin);
+			if (fgets(input, sizeof input, stdin) == NULL)
+				input[0] = '\0';
 			if ((reply[i].resp = strdup(input)) == NULL)
 				goto fail;
 			reply[i].resp_retcode = PAM_SUCCESS;