diff --git a/ChangeLog b/ChangeLog
index c6323e1d5..2202ac1f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-05  Richard Frith-Macdonald <rfm@gnu.org>
+
+        * Source/NSFileHandle: ([-sslHandshakeEstablished:outgoing:])
+        Set the connection into non-blocking mode so that the handshake
+        will not block if the other end refuses to talk to us.
+
 2012-12-01  Fred Kiefer <FredKiefer@gmx.de>
 
         * Source/NSXMLNode.m (-XMLStringWithOptions:): Use macros for
diff --git a/Source/NSFileHandle.m b/Source/NSFileHandle.m
index 67b79aa0b..5b55f25fd 100644
--- a/Source/NSFileHandle.m
+++ b/Source/NSFileHandle.m
@@ -1015,6 +1015,7 @@ GSTLSHandlePush(gnutls_transport_ptr_t handle, const void *buffer, size_t len)
               [d release];
             }
         }
+      [self setNonBlocking: YES];
       session = [[GSTLSSession alloc] initWithOptions: opts
                                             direction: isOutgoing
                                             transport: (void*)self