diff --git a/src/channel.c b/src/channel.c
index fab3589..9a14e1e 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -3542,6 +3542,7 @@
 
 /*
  * Set "channel"/"part" to non-blocking.
+ * Only works for sockets and pipes.
  */
     void
 channel_set_nonblock(channel_T *channel, ch_part_T part)
@@ -3552,15 +3553,12 @@
     if (fd != INVALID_FD)
     {
 #ifdef _WIN32
-	if (part == PART_SOCK)
-	{
-	    u_long	val = 1;
+	u_long	val = 1;
 
-	    ioctlsocket(fd, FIONBIO, &val);
-	}
-	else
+	ioctlsocket(fd, FIONBIO, &val);
+#else
+	fcntl(fd, F_SETFL, O_NONBLOCK);
 #endif
-	    fcntl(fd, F_SETFL, O_NONBLOCK);
 	ch_part->ch_nonblocking = TRUE;
     }
 }
@@ -3706,7 +3704,6 @@
 
 		    if (last != NULL)
 		    {
-		ch_log(channel, "Creating new entry");
 			last->wq_prev = wq->wq_prev;
 			last->wq_next = NULL;
 			if (wq->wq_prev == NULL)
diff --git a/src/version.c b/src/version.c
index 903b13e..7b17219 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    959,
+/**/
     958,
 /**/
     957,