diff --git a/src/main.c b/src/main.c
index eec93656..f2caf7a8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1182,11 +1182,6 @@ main (int argc, char **argv, char **envp)
   /* Useful for attaching debuggers, etc.  */
   SPIN ("main-entry");
 
-  /* Don't die if our stdout sends us SIGPIPE.  */
-#ifdef SIGPIPE
-  bsd_signal (SIGPIPE, SIG_IGN);
-#endif
-
 #ifdef HAVE_ATEXIT
   if (ANY_SET (check_io_state (), IO_STDOUT_OK))
     atexit (close_stdout);
@@ -1264,6 +1259,9 @@ main (int argc, char **argv, char **envp)
 #endif
 #ifdef SIGQUIT
   FATAL_SIG (SIGQUIT);
+#endif
+#ifdef SIGPIPE
+  FATAL_SIG (SIGPIPE);
 #endif
   FATAL_SIG (SIGINT);
   FATAL_SIG (SIGTERM);