diff --git a/daemon/daemon.c b/daemon/daemon.c
index 7c0c6c71c..48751364a 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -83,6 +83,8 @@ static RETSIGTYPE record_sigh(int sig)
 		case SIGHUP:
 			sig_record_reload++;
 			break;
+		case SIGPIPE:
+			break;
 		default:
 			log_err("ignoring signal %d", sig);
 	}
@@ -98,7 +100,8 @@ signal_handling_record()
 	if( signal(SIGTERM, record_sigh) == SIG_ERR ||
 		signal(SIGQUIT, record_sigh) == SIG_ERR ||
 		signal(SIGINT, record_sigh) == SIG_ERR ||
-		signal(SIGHUP, record_sigh) == SIG_ERR)
+		signal(SIGHUP, record_sigh) == SIG_ERR ||
+		signal(SIGPIPE, SIG_IGN) == SIG_ERR)
 		log_err("install sighandler: %s", strerror(errno));
 }
 
diff --git a/doc/Changelog b/doc/Changelog
index 8d3ffef6a..8dbd33d9f 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+22 April 2008: Wouter
+	- ignore SIGPIPE.
+
 21 April 2008: Wouter
 	- FEATURES document.
 	- fixup reread of config file if it was given as a full path