diff --git a/database-update.sql b/database-update.sql
index d020b4852..a5dbd60f9 100644
--- a/database-update.sql
+++ b/database-update.sql
@@ -11,3 +11,5 @@ DROP TABLE `frequency`;
 ALTER TABLE  `mempools` CHANGE  `mempool_index`  `mempool_index` VARCHAR( 16 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL;
 ALTER TABLE `vrfs` CHANGE `mplsVpnVrfRouteDistinguisher` `mplsVpnVrfRouteDistinguisher` varchar(26) default NOT NULL;
 ## Change port rrds
+ALTER TABLE  `devices` ADD  `timeout` INT NULL DEFAULT NULL AFTER  `port`;
+
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 42e761530..43959b75e 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -57,8 +57,8 @@ $config['show_services']           = 1;  # Enable Services on menu
 $config['ports_page_default']      = "details/"; ## eg "details/" "graphs/bits/"
 
 ### SNMP Settings
-$config['snmp']['timeout'] = 300;          # timeout in ms
-$config['snmp']['retries'] = 6;            # how many times to retry the query
+$config['snmp']['timeout'] = 1000;         # timeout in ms
+$config['snmp']['retries'] = 5;            # how many times to retry the query
 $config['snmp']['community'][] = "public"; # Communities to try during discovery (dangerous)
 
 ### Autodiscovery Settings
diff --git a/includes/snmp.inc.php b/includes/snmp.inc.php
index 40bbbff2c..c92c99576 100644
--- a/includes/snmp.inc.php
+++ b/includes/snmp.inc.php
@@ -13,7 +13,7 @@ function snmp_get_multi ($device, $oids, $options = "-OQUs", $mib = NULL, $mibdi
   if($options) { $cmd .= " " . $options; }
   if($mib) { $cmd .= " -m " . $mib; }
   if($mibdir) { $cmd .= " -M " . $mibdir; } else { $cmd .= " -M ".$config['mibdir']; }
-  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$device['hostname'].":".$device['port']." ".$oids;
   if (!$debug) { $cmd .= " 2>/dev/null"; }
   if($debug) { echo("$cmd\n"); }
@@ -40,7 +40,7 @@ function snmp_get ($device, $oid, $options = NULL, $mib = NULL, $mibdir = NULL)
   if($options) { $cmd .= " " . $options; }
   if($mib) { $cmd .= " -m " . $mib; }
   if($mibdir) { $cmd .= " -M " . $mibdir; } else { $cmd .= " -M ".$config['mibdir']; }
-  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$device['hostname'].":".$device['port']." ".$oid;
   if (!$debug) { $cmd .= " 2>/dev/null"; }
   if($debug) { echo("$cmd\n"); }
@@ -66,7 +66,7 @@ function snmp_walk($device, $oid, $options = NULL, $mib = NULL, $mibdir = NULL)
   if($options) { $cmd .= " $options "; }
   if($mib) { $cmd .= " -m $mib"; }
   if($mibdir) { $cmd .= " -M " . $mibdir; } else { $cmd .= " -M ".$config['mibdir']; }
-  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$device['hostname'].":".$device['port']." ".$oid;
   if (!$debug) { $cmd .= " 2>/dev/null"; }
   if($debug) { echo("$cmd\n"); }
@@ -104,7 +104,7 @@ function snmpwalk_cache_cip($device, $oid, $array, $mib = 0)
   $cmd  = $snmpcommand . " -O snQ -" . $device['snmpver'] . " -c " . $device['community'] . " ";
   if($mib) { $cmd .= " -m $mib"; }
   $cmd .= " -M ".$config['install_dir']."/mibs/";
-  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$device['hostname'].":".$device['port']." ".$oid;
   if (!$debug) { $cmd .= " 2>/dev/null"; }
   $data = trim(shell_exec($cmd));
@@ -145,7 +145,7 @@ function snmp_cache_ifIndex($device)
   $cmd  = $snmpcommand . " -O Qs -" . $device['snmpver'] . " -c " . $device['community'] . " ";
   $cmd .= " -M ".$config['install_dir']."/mibs/";
   $cmd .= " -m IF-MIB ifIndex";  
-  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'] . " " . $device['hostname'].":".$device['port'];
+  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'] . " " . $device['hostname'].":".$device['port'];
   if (!$debug) { $cmd .= " 2>/dev/null"; }
   $data = trim(shell_exec($cmd));
   $device_id = $device['device_id'];
@@ -244,7 +244,7 @@ function snmpwalk_cache_twopart_oid($device, $oid, $array, $mib = 0)
   $cmd  = $snmpcommand . " -O QUs -" . $device['snmpver'] . " -c " . $device['community'] . " ";
   $cmd .= " -M ".$config['install_dir']."/mibs/";
   if($mib) { $cmd .= " -m $mib"; }
-  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$device['hostname'].":".$device['port']." ".$oid;
   if (!$debug) { $cmd .= " 2>/dev/null"; }
   $data = trim(shell_exec($cmd));
@@ -273,7 +273,7 @@ function snmpwalk_cache_threepart_oid($device, $oid, $array, $mib = 0) {
   $cmd  = $snmpcommand . " -O QUs -" . $device['snmpver'] . " -c " . $device['community'] . " ";
   $cmd .= " -M ".$config['install_dir']."/mibs/";
   if($mib) { $cmd .= " -m $mib"; }
-  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$device['hostname'].":".$device['port']." ".$oid;
   if (!$debug) { $cmd .= " 2>/dev/null"; }
   $data = trim(shell_exec($cmd));
@@ -303,7 +303,7 @@ function snmp_cache_slotport_oid($oid, $device, $array, $mib = 0) {
   $cmd  = $snmpcommand . " -O QUs -" . $device['snmpver'] . " -c " . $device['community'] . " ";
   if($mib) { $cmd .= " -m $mib"; }
   $cmd .= " -M ".$config['install_dir']."/mibs/";
-  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$device['hostname'].":".$device['port']." ".$oid;
   if (!$debug) { $cmd .= " 2>/dev/null"; }
   $data = trim(shell_exec($cmd));
@@ -335,7 +335,7 @@ function snmp_cache_port_oids($oids, $port, $device, $array, $mib=0) {
   $cmd = $config['snmpget'] . " -O vq -" . $device['snmpver'] . " -c " . $device['community'] . " ";
   $cmd .= " -M ".$config['install_dir']."/mibs/";
   if($mib) { $cmd .= " -m $mib"; }
-  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$device['hostname'].":".$device['port']." ".$string;
   if (!$debug) { $cmd .= " 2>/dev/null"; }
   $data = trim(shell_exec($cmd));
@@ -355,7 +355,7 @@ function snmp_cache_portIfIndex ($device, $array) {
   global $config;
   $cmd = $config['snmpwalk'] . " -CI -m CISCO-STACK-MIB -O q -" . $device['snmpver'] . " -c " . $device['community'] . " ";
   $cmd .= " -M ".$config['install_dir']."/mibs/";
-  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$device['hostname'].":".$device['port']." portIfIndex";
   $output = trim(shell_exec($cmd));
   $device_id = $device['device_id'];
@@ -374,7 +374,7 @@ function snmp_cache_portName ($device, $array) {
   global $config;
   $cmd = $config['snmpwalk'] . " -CI -m CISCO-STACK-MIB -O Qs -" . $device['snmpver'] . " -c " . $device['community'] . " ";
   $cmd .= " -M ".$config['install_dir']."/mibs/";
-  #$cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
+  $cmd .= " -t " . $config['snmp']['timeout'] . " -r " . $config['snmp']['retries'];
   $cmd .= " ".$device['hostname'].":".$device['port']." portName";
   $output = trim(shell_exec($cmd));
   $device_id = $device['device_id'];