diff --git a/ChangeLog b/ChangeLog
index 8f015ac6e..7fc90927a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
    - deraadt@cvs.openbsd.org 2002/06/26 14:50:04
      [monitor_fdpass.c]
      use ssize_t for recvmsg() and sendmsg() return
+   - markus@cvs.openbsd.org 2002/06/26 14:51:33
+     [ssh-add.c]
+     fix exit code for -X/-x
 
 20020626
  - (stevesk) [monitor.c] remove duplicate proto15 dispatch entry for PAM
@@ -1178,4 +1181,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2304 2002/06/27 00:21:03 mouring Exp $
+$Id: ChangeLog,v 1.2305 2002/06/27 00:21:59 mouring Exp $
diff --git a/ssh-add.c b/ssh-add.c
index 176fd85c8..51490b776 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.61 2002/06/19 00:27:55 deraadt Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.62 2002/06/26 14:51:33 markus Exp $");
 
 #include <openssl/evp.h>
 
@@ -264,7 +264,7 @@ lock_agent(AuthenticationConnection *ac, int lock)
 		fprintf(stderr, "Failed to %slock agent.\n", lock ? "" : "un");
 	memset(p1, 0, strlen(p1));
 	xfree(p1);
-	return -1;
+	return (ret);
 }
 
 static int