diff --git a/src/warden-client/lib/WardenClientReceive.pm b/src/warden-client/lib/WardenClientReceive.pm
index 4fb27b867ae89d8935e7a17f28c1ca0138a8f93e..0b7a3f5774862943b0a9f674a30963b06d9df45d 100755
--- a/src/warden-client/lib/WardenClientReceive.pm
+++ b/src/warden-client/lib/WardenClientReceive.pm
@@ -43,12 +43,13 @@ sub c2s
   if (!($client = SOAP::Transport::HTTP::Client->new())) {
     errMsg("Sorry, unable to create socket: " . &SOAP::Transport::HTTP::Client::errstr)
   }
+  $client->timeout(60);
   $client->ssl_opts(verify_hostname     => 1,
-        		        SSL_use_cert        => 1,
-        		        SSL_verify_mode     => 0x02,
-        		        SSL_key_file        => $ssl_key_file,
-        		        SSL_cert_file       => $ssl_cert_file,
-        		        SSL_ca_file         => $ssl_ca_file);
+		    SSL_use_cert        => 1,
+		    SSL_verify_mode     => 0x02,
+		    SSL_key_file        => $ssl_key_file,
+		    SSL_cert_file       => $ssl_cert_file,
+		    SSL_ca_file         => $ssl_ca_file);
 
   # setting of URI and serialize SOAP envelope and data object
   my $soap     = SOAP::Lite->uri($service)->proxy($uri);
diff --git a/src/warden-client/lib/WardenClientSend.pm b/src/warden-client/lib/WardenClientSend.pm
index 25966b09ba51c78c1f3978c5c2ab88f155a209ee..05f7850bc0b3896ba8365f3ebb92a0339e2f6a35 100755
--- a/src/warden-client/lib/WardenClientSend.pm
+++ b/src/warden-client/lib/WardenClientSend.pm
@@ -39,17 +39,18 @@ sub c2s
   my $data		      = shift;
 
   my ($server, $port, $service) = $uri =~ /https:\/\/(.+)\:(\d+)\/(.+)/;
-  
+
   my $client;
   if (!($client = SOAP::Transport::HTTP::Client->new())) {
     errMsg("Sorry, unable to create socket: " . &SOAP::Transport::HTTP::Client::errstr)
   }
+  $client->timeout(60);
   $client->ssl_opts(verify_hostname     => 1,
-        		        SSL_use_cert        => 1,
-        		        SSL_verify_mode     => 0x02,
-        		        SSL_key_file        => $ssl_key_file,
-        		        SSL_cert_file       => $ssl_cert_file,
-        		        SSL_ca_file         => $ssl_ca_file);
+		    SSL_use_cert        => 1,
+		    SSL_verify_mode     => 0x02,
+		    SSL_key_file        => $ssl_key_file,
+		    SSL_cert_file       => $ssl_cert_file,
+		    SSL_ca_file         => $ssl_ca_file);
 
 
   # setting of URI and serialize SOAP envelope and data object