diff --git a/ChangeLog b/ChangeLog
index 965af4249..374be9208 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
    pam_nologin module. Report from William Yodlowsky 
    <bsd@openbsd.rutgers.edu>
  - (djm) Revert dirname fix, a better one is on its way.
+ - OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2001/07/04 22:47:19
+     [ssh-agent.c]
+     ignore SIGPIPE when debugging, too
 
 20010711
  - (djm) dirname(3) may modify its argument on glibc and other systems. 
@@ -5978,4 +5982,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1386 2001/07/14 01:55:15 djm Exp $
+$Id: ChangeLog,v 1.1387 2001/07/14 02:12:55 djm Exp $
diff --git a/ssh-agent.c b/ssh-agent.c
index 309b9d414..392d1a0cd 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssh-agent.c,v 1.60 2001/06/27 05:42:25 markus Exp $	*/
+/*	$OpenBSD: ssh-agent.c,v 1.61 2001/07/04 22:47:19 markus Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.60 2001/06/27 05:42:25 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.61 2001/07/04 22:47:19 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
@@ -1008,10 +1008,9 @@ skip:
 		alarm(10);
 	}
 	idtab_init();
-	if (!d_flag) {
+	if (!d_flag)
 		signal(SIGINT, SIG_IGN);
-		signal(SIGPIPE, SIG_IGN);
-	}
+	signal(SIGPIPE, SIG_IGN);
 	signal(SIGHUP, cleanup_handler);
 	signal(SIGTERM, cleanup_handler);
 	while (1) {