diff --git a/telnet/commands.c b/telnet/commands.c
index a64d763..c39b187 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -2491,8 +2491,7 @@ tn(int argc, char *argv[])
 	env_export("USER");
     }
     (void) call(status, "status", "notmuch", 0);
-    if (setjmp(peerdied) == 0)
-	telnet(user);
+    telnet(user); 
     (void) NetClose(net);
     ExitString("Connection closed by foreign host.\n",1);
     /*NOTREACHED*/
diff --git a/telnet/externs.h b/telnet/externs.h
index cfa1aec..e07aebb 100644
--- a/telnet/externs.h
+++ b/telnet/externs.h
@@ -233,7 +233,6 @@ extern void
     SetNetTrace(char *);	/* Function to change where debugging goes */
 
 extern jmp_buf
-    peerdied,
     toplevel;		/* For error conditions. */
 
 extern void
diff --git a/telnet/network.c b/telnet/network.c
index bb75d63..b140d60 100644
--- a/telnet/network.c
+++ b/telnet/network.c
@@ -158,7 +158,7 @@ netflush(void)
 	    perror(hostname);
 	    (void)NetClose(net);
 	    ring_clear_mark(&netoring);
-	    longjmp(peerdied, -1);
+	    ExitString("Connection closed by foreign host.\n", 1);
 	    /*NOTREACHED*/
 	}
 	n = 0;
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index 45ef1e2..9fba74f 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -808,14 +808,6 @@ NetNonblockingIO(int fd, int onoff)
  * Various signal handling routines.
  */
 
-/* ARGSUSED */
-static SIG_FUNC_RET
-deadpeer(int sig __unused)
-{
-	setcommandmode();
-	longjmp(peerdied, -1);
-}
-
 /* ARGSUSED */
 SIG_FUNC_RET
 intr(int sig __unused)
@@ -884,7 +876,7 @@ sys_telnet_init(void)
 {
     (void) signal(SIGINT, intr);
     (void) signal(SIGQUIT, intr2);
-    (void) signal(SIGPIPE, deadpeer);
+    (void) signal(SIGPIPE, SIG_IGN);
 #ifdef	SIGWINCH
     (void) signal(SIGWINCH, sendwin);
 #endif
diff --git a/telnet/telnet.c b/telnet/telnet.c
index 28237bd..8c457cf 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -146,7 +146,6 @@ unsigned char telopt_environ = TELOPT_NEW_ENVIRON;
 #endif
 
 jmp_buf	toplevel;
-jmp_buf	peerdied;
 
 int	flushline;
 int	linemode;
diff --git a/telnet/terminal.c b/telnet/terminal.c
index 3dda1c5..596c2b8 100644
--- a/telnet/terminal.c
+++ b/telnet/terminal.c
@@ -111,7 +111,8 @@ init_terminal(void)
 }
 
 /*
- *		Send as much data as possible to the terminal.
+ *		Send as much data as possible to the terminal, else exits if
+ *		it encounters a permanent failure when writing to the tty.
  *
  *		Return value:
  *			-1: No useful work done, data waiting to go out.
@@ -152,8 +153,19 @@ ttyflush(int drop)
 	}
 	ring_consumed(&ttyoring, n);
     }
-    if (n < 0)
+    if (n < 0) {
+	if (errno == EAGAIN || errno == EINTR) {
+	    return -1;
+	} else {
+	    ring_consumed(&ttyoring, ring_full_count(&ttyoring));
+	    setconnmode(0);
+	    setcommandmode();
+	    NetClose(net);
+	    fprintf(stderr, "Write error on local output.\n");
+	    exit(1);
+	}
 	return -1;
+    }
     if (n == n0) {
 	if (n0)
 	    return -1;