diff --git a/src/channel.c b/src/channel.c
index 967e2da..0106dfb 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -538,12 +538,11 @@
     }
     memcpy((char *)&server.sin_addr, host->h_addr, host->h_length);
 
-#if defined(__APPLE__) && __APPLE__ == 1
-    /* On Mac a zero timeout almost never works.  At least wait one
-     * millisecond. */
+    /* On Mac and Solaris a zero timeout almost never works.  At least wait
+     * one millisecond. Let's do it for all systems, because we don't know why
+     * this is needed. */
     if (waittime == 0)
 	waittime = 1;
-#endif
 
     /*
      * For Unix we need to call connect() again after connect() failed.
diff --git a/src/version.c b/src/version.c
index 916c52c..b887dac 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1361,
+/**/
     1360,
 /**/
     1359,