diff --git a/SteamKit2/SteamKit2/Networking/Steam2/TcpSocket.cs b/SteamKit2/SteamKit2/Networking/Steam2/TcpSocket.cs
index 48592c3fc..f5591efb3 100644
--- a/SteamKit2/SteamKit2/Networking/Steam2/TcpSocket.cs
+++ b/SteamKit2/SteamKit2/Networking/Steam2/TcpSocket.cs
@@ -4,7 +4,7 @@
  */
 
 
-
+using System;
 using System.IO;
 using System.Net;
 using System.Net.Sockets;
@@ -32,12 +32,19 @@ sealed class TcpSocket
         /// <value>The binary writer.</value>
         public BinaryWriter Writer { get; private set; }
 
+        /// <summary>
+        /// Gets the length of time a connection will attempt to establish before timing out. The default timeout is 30 seconds.
+        /// </summary>
+        /// <value>The connection timeout.</value>
+        public TimeSpan ConnectionTimeout { get; set; }
+
 
         /// <summary>
         /// Initializes a new instance of the <see cref="TcpSocket"/> class.
         /// </summary>
         public TcpSocket()
         {
+            ConnectionTimeout = TimeSpan.FromSeconds( 30 );
         }
 
 
@@ -50,9 +57,17 @@ public void Connect( IPEndPoint endPoint )
             Disconnect();
 
             sock = new Socket( AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp );
-            sock.Connect( endPoint );
+            var asyncResult = sock.BeginConnect( endPoint, null, null );
+
+            bConnected = asyncResult.AsyncWaitHandle.WaitOne( ConnectionTimeout );
+
+            if ( !bConnected )
+            {
+                sock.Close();
+                return;
+            }
 
-            bConnected = true;
+            sock.EndConnect( asyncResult );
 
             sockStream = new NetworkStream( sock, true );
 
diff --git a/SteamKit2/SteamKit2/Steam2/ServerClient.cs b/SteamKit2/SteamKit2/Steam2/ServerClient.cs
index 565295b12..dd83cd4fe 100644
--- a/SteamKit2/SteamKit2/Steam2/ServerClient.cs
+++ b/SteamKit2/SteamKit2/Steam2/ServerClient.cs
@@ -4,7 +4,7 @@
  */
 
 
-
+using System;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
@@ -91,6 +91,17 @@ public class ServerClient
         /// <value>The end point.</value>
         protected IPEndPoint EndPoint { get; private set; }
 
+        /// <summary>
+        /// Gets the length of time a connection will attempt to establish before timing out. The default timeout is 30 seconds.
+        /// </summary>
+        /// <value>The connection timeout.</value>
+        public TimeSpan ConnectionTimeout
+        {
+            get { return Socket.ConnectionTimeout; }
+            set { Socket.ConnectionTimeout = value; }
+        }
+
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerClient"/> class.
         /// </summary>
@@ -99,6 +110,7 @@ public ServerClient()
             Socket = new TcpSocket();
         }
 
+
         /// <summary>
         /// Connects to the specified end point.
         /// </summary>