diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index d7e64bae9..bf00cd7f1 100644
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -7,6 +7,7 @@ Cacti CHANGELOG
 -issue#981: Hyperlinks for Data Profile stats
 -issue#993: Realtime not working on remote pollers for certain data query
 -issue#1251: Make 3rd mouse button configurable for all zoom modes. Set default to zoom out.
+-issue#1281: The variable max_oids is for bulkget and not bulkwalk operations
 -issue#1286: Correct CHUNKED_ENCODING error when retrieving graph with some browsers
 -issue#1306: Fix issue #1306 where multi-value args are not parsing correctly
 -issue#1309: Provide meaningful authentication errors in graph_json.php and graph_image.php
diff --git a/include/global_settings.php b/include/global_settings.php
index a1a5702ce..afdf9c306 100644
--- a/include/global_settings.php
+++ b/include/global_settings.php
@@ -947,6 +947,25 @@ $settings = array(
 			'method' => 'checkbox',
 			'default' => ''
 			),
+		'snmp_bulk_walk_size' => array(
+			'friendly_name' => __('SNMP Bulkwalk Fetch Size'),
+			'description' => __('How many OID\'s should be returned per snmpbulkwalk request?  For Devices with large SNMP trees, increasing this size will increase re-index performance over a WAN.'),
+			'method' => 'drop_array',
+			'default' => '10',
+			'array' => array(
+				'10' => '10',
+				'20' => '20',
+				'30' => '30',
+				'40' => '40',
+				'50' => '50',
+				'60' => '60',
+				'70' => '70',
+				'80' => '80',
+				'90' => '90',
+				'100' => '100',
+				'150' => '150',
+				'200' => '200')
+			),
 		'spine_header' => array(
 			'friendly_name' => __('Spine Specific Execution Parameters'),
 			'collapsible' => 'true',
diff --git a/lib/snmp.php b/lib/snmp.php
index a7ede4eb9..0ee0ea224 100644
--- a/lib/snmp.php
+++ b/lib/snmp.php
@@ -620,6 +620,8 @@ function cacti_snmp_walk($hostname, $community, $oid, $version, $auth_user, $aut
 			$oidCheck = '';
 		}
 
+		$max_oids = read_config_option('snmp_bulk_walk_size');
+
 		if (file_exists($path_snmpbulkwalk) && ($version > 1) && ($max_oids > 1)) {
 			$temp_array = exec_into_array(cacti_escapeshellcmd($path_snmpbulkwalk) .
 				' -O QnU'  . ($value_output_format == SNMP_STRING_OUTPUT_HEX ? 'x ':' ') . $snmp_auth .