diff --git a/ChangeLog b/ChangeLog
index 6050b1252..2070718cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 20001017
  - (djm) Add -lregex to cywin libs from Corinna Vinschen
    <vinschen@cygnus.com>
+ - (djm) Don't rely on atomicio's retval to determine length of askpass
+   supplied passphrase. Problem report from Lutz Jaenicke
+   <Lutz.Jaenicke@aet.TU-Cottbus.DE>
 
 20001016
  - (djm) Sync with OpenBSD:
diff --git a/ssh-add.c b/ssh-add.c
index efbf771d3..3adc2509f 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -117,7 +117,9 @@ ssh_askpass(char *askpass, char *msg)
 		fatal("ssh_askpass: exec(%s): %s", askpass, strerror(errno));
 	}
 	close(p[1]);
-	len = atomicio(read, p[0], buf, sizeof buf);
+	buf[0] = '\0';
+	atomicio(read, p[0], buf, sizeof buf);
+	len = strlen(buf);
 	close(p[0]);
 	while (waitpid(pid, &status, 0) < 0)
 		if (errno != EINTR)