diff --git a/unix/uxplink.c b/unix/uxplink.c
index 37c8533e..b3e5679d 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -885,6 +885,12 @@ int main(int argc, char **argv)
     if (portnumber != -1)
 	conf_set_int(conf, CONF_port, portnumber);
 
+    /*
+     * Block SIGPIPE, so that we'll get EPIPE individually on
+     * particular network connections that go wrong.
+     */
+    putty_signal(SIGPIPE, SIG_IGN);
+
     /*
      * Set up the pipe we'll use to tell us about SIGWINCH.
      */