diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 8c02f3779d..1286a62c7b 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -621,4 +621,9 @@ $config['ipmi']['type'][]                                = "open";
 // Options needed for dyn config - do NOT edit
 $dyn_config['email_backend'] = array('mail','sendmail','smtp');
 $dyn_config['email_smtp_secure'] = array('', 'tls', 'ssl');
+
+// Unix-agent poller module config settings
+$config['unix-agent-connection-time-out'] 		= 10; //seconds
+$config['unix-agent-read-time-out'] 			= 10; //seconds
+
 ?>
diff --git a/includes/polling/unix-agent.inc.php b/includes/polling/unix-agent.inc.php
index fa2fb1c90d..5204a92f46 100644
--- a/includes/polling/unix-agent.inc.php
+++ b/includes/polling/unix-agent.inc.php
@@ -10,10 +10,10 @@ if ($device['os_group'] == "unix")
   $agent_port='6556';
 
   $agent_start = utime();
-  $agent = fsockopen($device['hostname'], $agent_port, $errno, $errstr, 10);
+  $agent = fsockopen($device['hostname'], $agent_port, $errno, $errstr, $config['unix-agent-connection-time-out'] );
 
   // Set stream timeout (for timeouts during agent  fetch
-  stream_set_timeout($agent,10);
+  stream_set_timeout($agent,$config['unix-agent-read-time-out']);
   $agentinfo = stream_get_meta_data($agent);
 
   if (!$agent)