diff --git a/ChangeLog b/ChangeLog
index f6d4c4447..ac7bca633 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    - stevesk@cvs.openbsd.org 2001/04/08 16:01:36
      [sshd.8]
      document ListenAddress addr:port
+   - markus@cvs.openbsd.org 2001/04/08 13:03:00
+     [ssh-add.c]
+     init pointers with NULL, thanks to danimal@danimal.org
 
 20010408
  - OpenBSD CVS Sync
@@ -4943,4 +4946,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1080 2001/04/08 18:02:43 mouring Exp $
+$Id: ChangeLog,v 1.1081 2001/04/08 18:04:36 mouring Exp $
diff --git a/ssh-add.c b/ssh-add.c
index 05ff4cab8..eaa773816 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.31 2001/03/26 08:07:08 markus Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.32 2001/04/08 13:03:00 markus Exp $");
 
 #include <openssl/evp.h>
 
@@ -59,7 +59,7 @@ void
 delete_file(AuthenticationConnection *ac, const char *filename)
 {
 	Key *public;
-	char *comment;
+	char *comment = NULL;
 
 	public = key_load_public(filename, &comment);
 	if (public == NULL) {
@@ -136,7 +136,7 @@ add_file(AuthenticationConnection *ac, const char *filename)
 {
 	struct stat st;
 	Key *private;
-	char *comment, *askpass = NULL, *pass;
+	char *comment = NULL, *askpass = NULL, *pass;
 	char buf[1024], msg[1024];
 	int interactive = isatty(STDIN_FILENO);