diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md
index ba04e326a..15db7e2e5 100644
--- a/doc/10-icinga-template-library.md
+++ b/doc/10-icinga-template-library.md
@@ -2023,6 +2023,7 @@ snmp_crit               | **Optional.** The critical threshold.
 snmp_storage_name       | **Optional.** Storage name. Default to regex "^/$$". More options available in the [snmp storage](http://nagios.manubulon.com/snmp_storage.html) documentation.
 snmp_perf               | **Optional.** Enable perfdata values. Defaults to true.
 snmp_timeout            | **Optional.** The command timeout in seconds. Defaults to 5 seconds.
+snmp_storage_olength	| **Optional.** Max-size of the SNMP message, usefull in case of Too Long responses.
 
 ### snmp-interface <a id="plugin-check-command-snmp-interface"></a>
 
diff --git a/itl/command-plugins-manubulon.conf b/itl/command-plugins-manubulon.conf
index d1e2abe3c..1356bc913 100644
--- a/itl/command-plugins-manubulon.conf
+++ b/itl/command-plugins-manubulon.conf
@@ -201,6 +201,10 @@ object CheckCommand "snmp-storage" {
 			set_if = "$snmp_perf$"
 			description = "Perfparse compatible output"
 		}
+		"-o" = {
+			value = "$snmp_storage_olength$"
+			description = "Max-size of the SNMP message, usefull in case of Too Long responses."
+		}
 	}
 
 	vars.snmp_storage_name = "^/$$"
@@ -384,4 +388,4 @@ object CheckCommand "snmp-service" {
 	}
 	
 	vars.snmp_service_name = ".*"
-}
\ No newline at end of file
+}