diff --git a/libtransmission/handshake.c b/libtransmission/handshake.c
index bb1a0fb2c..9174f3568 100644
--- a/libtransmission/handshake.c
+++ b/libtransmission/handshake.c
@@ -64,7 +64,7 @@ enum
     CRYPTO_PROVIDE_CRYPTO          = 2,
 
     /* how long to wait before giving up on a handshake */
-    HANDSHAKE_TIMEOUT_SEC          = 60
+    HANDSHAKE_TIMEOUT_SEC          = 30
 };