diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog
index 76d1165dff..2263ed48f3 100644
--- a/legacy/evil/ChangeLog
+++ b/legacy/evil/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-20  Vincent Torri  <doursse at users dot sf dot net>
+
+	reviewed by: Vincent Torri
+	patch by: Lance Fetters
+
+	* src/lib/evil_unistd.c:
+	make evil_pipe() non blocking
+
 2009-04-18  Vincent Torri  <doursse at users dot sf dot net>
 
 	* configure.ac:
diff --git a/legacy/evil/src/lib/evil_unistd.c b/legacy/evil/src/lib/evil_unistd.c
index d9eea5a021..6628137637 100644
--- a/legacy/evil/src/lib/evil_unistd.c
+++ b/legacy/evil/src/lib/evil_unistd.c
@@ -383,11 +383,11 @@ evil_pipe(int *fds)
    if (!FD_ISSET (socket1, &write_set))
      goto out2;
 
-   arg = 0;
+   arg = 1;
    if (ioctlsocket (socket1, FIONBIO, &arg) == SOCKET_ERROR)
      goto out2;
 
-   arg = 0;
+   arg = 1;
    if (ioctlsocket (socket2, FIONBIO, &arg) == SOCKET_ERROR)
      goto out2;