diff --git a/doc/Support/Configuration.md b/doc/Support/Configuration.md
index 13f16c0c5f..bb46686239 100644
--- a/doc/Support/Configuration.md
+++ b/doc/Support/Configuration.md
@@ -365,19 +365,25 @@ $config['poller_modules']['bgp-peers'] = false;
 
 ### SNMP Settings
 
-```php
-$config['snmp']['timeout'] = 1;            # timeout in seconds
-$config['snmp']['retries'] = 5;            # how many times to retry the query
-$config['snmp']['transports'] = array('udp', 'udp6', 'tcp', 'tcp6');
-$config['snmp']['version'] = ['v2c', 'v3', 'v1'];         # Default versions to use
-$config['snmp']['port'] = 161;
-```
 Default SNMP options including retry and timeout settings and also default version and port.
 
+```php
+$config['snmp']['timeout'] = 1;            				# timeout in seconds
+$config['snmp']['retries'] = 5;            				# how many times to retry the query
+$config['snmp']['transports'] = array('udp', 'udp6', 'tcp', 'tcp6');	# Transports to use
+$config['snmp']['version'] = ['v2c', 'v3', 'v1'];         		# Default versions to use
+$config['snmp']['port'] = 161;						# Default port
+$config['snmp']['exec_timeout'] = 1200;					# execution time limit in seconds
+```
+>NOTE: `timeout` is the time to wait for an answer and `exec_timeout` is the max time to run a query. 
+
+The default v1/v2c snmp community to use, you can expand this array with `[1]`, `[2]`, `[3]`, etc.
+
 ```php
 $config['snmp']['community'][0] = "public";
 ```
-The default v1/v2c snmp community to use, you can expand this array with `[1]`, `[2]`, `[3]`, etc.
+
+The default v3 snmp details to use, you can expand this array with `[1]`, `[2]`, `[3]`, etc.
 
 ```php
 $config['snmp']['v3'][0]['authlevel'] = "noAuthNoPriv";  # noAuthNoPriv | authNoPriv | authPriv
@@ -387,7 +393,6 @@ $config['snmp']['v3'][0]['authalgo'] = "MD5";            # MD5 | SHA
 $config['snmp']['v3'][0]['cryptopass'] = "";             # Privacy (Encryption) Passphrase
 $config['snmp']['v3'][0]['cryptoalgo'] = "AES";          # AES | DES
 ```
-The default v3 snmp details to use, you can expand this array with `[1]`, `[2]`, `[3]`, etc.
 
 ### Auto discovery settings