diff --git a/squeaknode/network/connection.py b/squeaknode/network/connection.py
index 68d1263d..6659f1d5 100644
--- a/squeaknode/network/connection.py
+++ b/squeaknode/network/connection.py
@@ -29,7 +29,7 @@ from squeak.messages import msg_subscribe
 from squeaknode.network.peer import Peer
 from squeaknode.network.peer_message_handler import PeerMessageHandler
 
-HANDSHAKE_TIMEOUT = 5
+HANDSHAKE_TIMEOUT = 30
 
 
 logger = logging.getLogger(__name__)
diff --git a/squeaknode/network/peer_client.py b/squeaknode/network/peer_client.py
index e49698a2..bc02ede2 100644
--- a/squeaknode/network/peer_client.py
+++ b/squeaknode/network/peer_client.py
@@ -28,7 +28,7 @@ import socks
 from squeaknode.core.peer_address import PeerAddress
 
 
-SOCKET_CONNECT_TIMEOUT = 5
+SOCKET_CONNECT_TIMEOUT = 30
 
 
 logger = logging.getLogger(__name__)