diff --git a/.mailmap b/.mailmap
index c7fc49152..e9f2417c1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,3 +5,4 @@ Gunnar Beutner <gunnar.beutner@netways.de> <icinga@net-icinga2.adm.netways.de>
 <michael.friedrich@netways.de> <Michael.Friedrich@netways.de>
 <tobias.vonderkrone@profitbricks.com> <tobias@vonderkrone.info>
 Jean-Marcel Flach <jean-marcel.flach@netways.de> <jean-marcel.flach@netways.de>
+Dolf Schimmel <dolf@transip.nl> <dolf@dolfschimmel.nl>
diff --git a/doc/7-icinga-template-library.md b/doc/7-icinga-template-library.md
index a5b27658c..e3d103a47 100644
--- a/doc/7-icinga-template-library.md
+++ b/doc/7-icinga-template-library.md
@@ -598,6 +598,11 @@ snmp_eregi          | **Optional.** Return OK state if case-insensitive extended
 snmp_label          | **Optional.** Prefix label for output value
 snmp_invert_search  | **Optional.** Invert search result and return CRITICAL state if found
 snmp_units          | **Optional.** Units label(s) for output value (e.g., 'sec.').
+snmp_version        | **Optional.** Version to use. E.g. 1, 2, 2c or 3.
+snmp_miblist        | **Optional.** MIB's to use, comma separated. Defaults to "ALL".
+snmp_rate_multiplier | **Optional.** Converts rate per second. For example, set to 60 to convert to per minute.
+snmp_rate           | **Optional.** Boolean. Enable rate calculation.
+snmp_getnext        | **Optional.** Boolean. Use SNMP GETNEXT. Defaults to false.
 snmp_timeout        | **Optional.** The command timeout in seconds. Defaults to 10 seconds.
 
 ### <a id="plugin-check-command-snmpv3"></a> snmpv3
diff --git a/doc/9-monitoring-remote-systems.md b/doc/9-monitoring-remote-systems.md
index 92d65c11c..6ff49bb67 100644
--- a/doc/9-monitoring-remote-systems.md
+++ b/doc/9-monitoring-remote-systems.md
@@ -634,12 +634,17 @@ have the `snmp-community` custom attribute.
 
       check_command = "snmp"
       vars.snmp_oid = "1.3.6.1.2.1.1.3.0"
+      vars.snmp_miblist = "DISMAN-EVENT-MIB"
 
       assign where host.vars.snmp_community != ""
     }
 
 Additional SNMP plugins are available using the [Manubulon SNMP Plugins](7-icinga-template-library.md#snmp-manubulon-plugin-check-commands).
 
+If no `snmp_miblist` is specified the plugin will default to `ALL`. As the number of available MIB files
+on the system increases so will the load generated by this plugin if no `MIB` is specified.
+As such, it is recommended to always specify at least one `MIB`.
+
 ### <a id="agent-based-checks-ssh"></a> SSH
 
 Calling a plugin using the SSH protocol to execute a plugin on the remote server fetching
diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index a543612e4..5ffb48951 100644
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -749,6 +749,17 @@ object CheckCommand "snmp" {
 			set_if = "$snmp_invert_search$"
 			description = "Invert search result and return CRITICAL if found"
 		}
+		"-P" = "$snmp_version$"
+		"-m" = "$snmp_miblist$"
+		"--rate-multiplier" = "$snmp_rate_multiplier$"
+		"--rate" = {
+			set_if = "$snmp_rate$"
+			description = "Enable rate calculation"
+		}
+		"-n" = {
+			set_if = "$snmp_getnext$"
+			description = "Use SNMP GETNEXT instead of SNMP GET"
+		}
 	}
 
 	vars.snmp_address = {{