diff --git a/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java b/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
index 060182707..b9fec69ae 100644
--- a/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
+++ b/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
@@ -289,9 +289,11 @@ public class SSLSocketFactory implements LayeredSocketFactory {
             sslock.bind(isa);
         }
 
-        int timeout = HttpConnectionParams.getConnectionTimeout(params);
-        sslock.connect(target, timeout);
+        int connTimeout = HttpConnectionParams.getConnectionTimeout(params);
+        int soTimeout = HttpConnectionParams.getSoTimeout(params);
 
+        sslock.connect(target, connTimeout);
+        sslock.setSoTimeout(soTimeout);
         try {
             hostnameVerifier.verify(host, sslock);
             // verifyHostName() didn't blowup - good!