diff --git a/src/org/jruby/ext/socket/RubyTCPSocket.java b/src/org/jruby/ext/socket/RubyTCPSocket.java
index e25ee25..3a69c0a 100644
--- a/src/org/jruby/ext/socket/RubyTCPSocket.java
+++ b/src/org/jruby/ext/socket/RubyTCPSocket.java
@@ -107,7 +107,7 @@ public class RubyTCPSocket extends RubyIPSocket {
                 // Do this nonblocking so we can be interrupted
                 channel.configureBlocking(false);
                 channel.connect( new InetSocketAddress(InetAddress.getByName(remoteHost), remotePort) );
-                context.getThread().select(channel, this, SelectionKey.OP_CONNECT);
+                context.getThread().select(channel, this, SelectionKey.OP_CONNECT, 600000);
                 channel.finishConnect();
 
                 // only try to set blocking back if we succeeded to finish connecting