--- openssh-4.0p1/clientloop.c.orig	2005-03-01 11:24:33.000000000 +0100
+++ openssh-4.0p1/clientloop.c	2005-03-10 15:10:05.000000000 +0100
@@ -104,6 +104,9 @@
  */
 extern char *host;
 
+/* if we process SIGPIPE */
+extern int enable_sigpipe;
+
 /*
  * Flag to indicate that we have received a window change signal which has
  * not yet been processed.  This will cause a message indicating the new
@@ -1236,6 +1239,8 @@
 		signal(SIGQUIT, signal_handler);
 	if (signal(SIGTERM, SIG_IGN) != SIG_IGN)
 		signal(SIGTERM, signal_handler);
+	if (enable_sigpipe)
+		signal(SIGPIPE, signal_handler);
 	signal(SIGWINCH, window_change_handler);
 
 	if (have_pty)
diff -urN openssh-3.9p1.org/ssh.0 openssh-3.9p1/ssh.0
--- openssh-3.9p1.org/ssh.0	2004-08-17 19:03:29.327565840 +0200
+++ openssh-3.9p1/ssh.0	2004-08-17 19:03:41.809668272 +0200
@@ -433,6 +433,8 @@ DESCRIPTION
      -y      Send log information using the syslog(3) system module.  By
              default this information is sent to stderr.
 
+     -Z      Enable SIGPIPE processing.
+
      ssh may additionally obtain configuration data from a per-user
      configuration file and a system-wide configuration file.  The file format
      and configuration options are described in ssh_config(5).
--- openssh-5.6p1/ssh.1~	2010-08-24 14:05:48.000000000 +0300
+++ openssh-5.6p1/ssh.1	2010-08-24 14:06:57.879253682 +0300
@@ -42,7 +42,7 @@
 .Nd OpenSSH SSH client (remote login program)
 .Sh SYNOPSIS
 .Nm ssh
-.Op Fl 46AaCfGgKkMNnqsTtVvXxYy
+.Op Fl 46AaCfGgKkMNnqsTtVvXxYyZ
 .Op Fl B Ar bind_interface
 .Op Fl b Ar bind_address
 .Op Fl c Ar cipher_spec
@@ -138,6 +138,11 @@ on the local machine as the source addre
 of the connection.
 Only useful on systems with more than one address.
 .Pp
+.It Fl Z
+Enables processing of SIGPIPE. Useful when using ssh output as input for
+another process, for example in a shell script. Be careful - it may break
+port/X11 forwarding when used.
+.Pp
 .It Fl C
 Requests compression of all data (including stdin, stdout, stderr, and
 data for forwarded X11, TCP and
--- openssh-4.0p1/ssh.c.orig	2005-03-02 02:04:33.000000000 +0100
+++ openssh-4.0p1/ssh.c	2005-03-10 15:11:10.000000000 +0100
@@ -135,6 +135,9 @@
 /* Should we execute a command or invoke a subsystem? */
 int subsystem_flag = 0;
 
+/* Enable sigpipe */
+int enable_sigpipe = 0;
+
 /* # of replies received for global requests */
 static int client_global_request_id = 0;
 
@@ -204,7 +204,7 @@ static void
 usage(void)
 {
 	fprintf(stderr,
-"usage: ssh [-46AaCfGgKkMNnqsTtVvXxYy] [-B bind_interface]\n"
+"usage: ssh [-46AaCfGgKkMNnqsTtVvXxYyZ] [-B bind_interface]\n"
 "           [-b bind_address] [-c cipher_spec] [-D [bind_address:]port]\n"
 "           [-E log_file] [-e escape_char] [-F configfile] [-I pkcs11]\n"
 "           [-i identity_file] [-J [user@]host[:port]] [-L address]\n"
@@ -666,7 +666,7 @@ main(int ac, char **av)
 
  again:
 	while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx"
-	    "AB:CD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
+	    "AB:CD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYyZ")) != -1) {
 		switch (opt) {
 		case '1':
 			fatal("SSH protocol v.1 is no longer supported");
@@ -985,6 +985,9 @@ main(int ac, char **av)
 		case 'F':
 			config = optarg;
 			break;
+		case 'Z':
+			enable_sigpipe = 1;
+			break;
 		default:
 			usage();
 		}