diff --git a/unix/uxplink.c b/unix/uxplink.c
index 6b56d2af..c1117e43 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -385,7 +385,7 @@ void try_output(int is_stderr)
     ret = write(fd, senddata, sendlen);
     if (ret > 0)
 	bufchain_consume(chain, ret);
-    else if (ret < 0) {
+    else if (ret < 0 && errno != EWOULDBLOCK) {
 	perror(is_stderr ? "stderr: write" : "stdout: write");
 	exit(1);
     }
@@ -883,6 +883,23 @@ int main(int argc, char **argv)
     local_tty = (tcgetattr(0, &orig_termios) == 0);
     atexit(cleanup_termios);
     ldisc_update(NULL, 1, 1);
+
+    {
+	int fl;
+	/*
+	 * Make sure that stdout/err are non-blocking.
+	 */
+	if ((fl = fcntl(1, F_GETFL)) == -1 ||
+	    fcntl(1, F_SETFL, fl | O_NONBLOCK) == -1) {
+	    perror("stdout");
+	    exit(1);
+	}
+	if ((fl = fcntl(2, F_GETFL)) == -1 ||
+	    fcntl(2, F_SETFL, fl | O_NONBLOCK) == -1) {
+	    perror("stderr");
+	    exit(1);
+	}
+    }
     sending = FALSE;
     now = GETTICKCOUNT();