diff --git a/server-client.c b/server-client.c
index b1b2f2db..251a0094 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1,4 +1,4 @@
-/* $Id: server-client.c,v 1.37 2010-08-09 21:44:25 tcunha Exp $ */
+/* $Id: server-client.c,v 1.38 2010-08-09 21:45:37 tcunha Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -647,9 +647,11 @@ server_client_msg_dispatch(struct client *c)
 				fatalx("MSG_IDENTIFY missing fd");
 			memcpy(&identifydata, imsg.data, sizeof identifydata);
 
-			c->stdin_fd = imsg.fd;
-			c->stdin_event = bufferevent_new(imsg.fd, NULL, NULL,
-			    server_client_in_callback, c);
+			c->stdin_fd = dup(imsg.fd);
+			if (c->stdin_fd == -1)
+				fatal("dup failed");
+			c->stdin_event = bufferevent_new(c->stdin_fd,
+			    NULL, NULL, server_client_in_callback, c);
 			if (c->stdin_event == NULL)
 				fatalx("failed to create stdin event");
 
@@ -667,14 +669,14 @@ server_client_msg_dispatch(struct client *c)
 				fatalx("MSG_STDOUT missing fd");
 
 			c->stdout_fd = imsg.fd;
-			c->stdout_event = bufferevent_new(imsg.fd, NULL, NULL,
-			    server_client_out_callback, c);
+			c->stdout_event = bufferevent_new(c->stdout_fd,
+			    NULL, NULL, server_client_out_callback, c);
 			if (c->stdout_event == NULL)
 				fatalx("failed to create stdout event");
 
-			if ((mode = fcntl(imsg.fd, F_GETFL)) != -1)
-				fcntl(imsg.fd, F_SETFL, mode|O_NONBLOCK);
-			if (fcntl(imsg.fd, F_SETFD, FD_CLOEXEC) == -1)
+			if ((mode = fcntl(c->stdout_fd, F_GETFL)) != -1)
+				fcntl(c->stdout_fd, F_SETFL, mode|O_NONBLOCK);
+			if (fcntl(c->stdout_fd, F_SETFD, FD_CLOEXEC) == -1)
 				fatal("fcntl failed");
 			break;
 		case MSG_STDERR:
@@ -684,14 +686,14 @@ server_client_msg_dispatch(struct client *c)
 				fatalx("MSG_STDERR missing fd");
 
 			c->stderr_fd = imsg.fd;
-			c->stderr_event = bufferevent_new(imsg.fd, NULL, NULL,
-			    server_client_err_callback, c);
+			c->stderr_event = bufferevent_new(c->stderr_fd,
+			    NULL, NULL, server_client_err_callback, c);
 			if (c->stderr_event == NULL)
 				fatalx("failed to create stderr event");
 
-			if ((mode = fcntl(imsg.fd, F_GETFL)) != -1)
-				fcntl(imsg.fd, F_SETFL, mode|O_NONBLOCK);
-			if (fcntl(imsg.fd, F_SETFD, FD_CLOEXEC) == -1)
+			if ((mode = fcntl(c->stderr_fd, F_GETFL)) != -1)
+				fcntl(c->stderr_fd, F_SETFL, mode|O_NONBLOCK);
+			if (fcntl(c->stderr_fd, F_SETFD, FD_CLOEXEC) == -1)
 				fatal("fcntl failed");
 			break;
 		case MSG_RESIZE: