diff --git a/raritan/rpc/Agent.py b/raritan/rpc/Agent.py
index 9e43b30..b05541f 100644
--- a/raritan/rpc/Agent.py
+++ b/raritan/rpc/Agent.py
@@ -72,11 +72,11 @@ def json_rpc(self, target, method, params=[], redirected=False):
                 'authorization': "Basic %s" % b64auth.decode('ascii')
             }
 
-        max_retries = 3
+        max_retries = 5
         retry = 1
         while retry <= max_retries:
             try:
-                conn = http.client.HTTPSConnection(pdu_ip_address, context=ctx) #self.url
+                conn = http.client.HTTPSConnection(pdu_ip_address, context=ctx, timeout=30) #self.url
                 conn.request("POST", target, request_json, headers)
                 res = conn.getresponse()
                 break