diff --git a/ChangeLog b/ChangeLog
index 93aaeb033..01de90fd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
      make sure the signature has at least the expected length (don't
      insist on len == hlen + oidlen, since this breaks some smartcards)
      bugzilla #592; ok djm@
+   - markus@cvs.openbsd.org 2003/06/16 10:22:45
+     [ssh-add.c]
+     print out key comment on each prompt; make ssh-askpass more useable; ok djm@
 
 20030614
  - (djm) Update license on fake-rfc2553.[ch]; ok itojun@
@@ -532,4 +535,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2806 2003/06/18 10:29:01 djm Exp $
+$Id: ChangeLog,v 1.2807 2003/06/18 10:29:18 djm Exp $
diff --git a/ssh-add.c b/ssh-add.c
index 9d14a3649..5b0fbbce6 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.67 2003/06/11 11:18:38 djm Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.68 2003/06/16 10:22:45 markus Exp $");
 
 #include <openssl/evp.h>
 
@@ -164,7 +164,8 @@ add_file(AuthenticationConnection *ac, const char *filename)
 			if (private != NULL)
 				break;
 			clear_pass();
-			strlcpy(msg, "Bad passphrase, try again: ", sizeof msg);
+			snprintf(msg, sizeof msg,
+			    "Bad passphrase, try again for %.200s: ", comment);
 		}
 	}