diff --git a/doc/7-icinga-template-library.md b/doc/7-icinga-template-library.md
index 90e8e4131..bfeef033a 100644
--- a/doc/7-icinga-template-library.md
+++ b/doc/7-icinga-template-library.md
@@ -443,6 +443,7 @@ Name            | Description
 ----------------|--------------
 imap_address    | **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, "$address6$" otherwise.
 imap_port       | **Optional.** The port that should be checked. Defaults to 143.
+imap_timeout    | **Optional.** The timeout in seconds.
 
 
 ## <a id="plugin-check-command-ldap"></a> ldap
@@ -635,6 +636,7 @@ Name            | Description
 ----------------|--------------
 pop_address     | **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, "$address6$" otherwise.
 pop_port        | **Optional.** The port that should be checked. Defaults to 110.
+pop_timeout     | **Optional.** The timeout in seconds.
 
 
 ## <a id="plugin-check-command-processes"></a> procs
@@ -680,6 +682,7 @@ Name            | Description
 ----------------|--------------
 simap_address   | **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, "$address6$" otherwise.
 simap_port      | **Optional.** The host's port.
+simap_timeout   | **Optional.** The timeout in seconds.
 
 
 ## <a id="plugin-check-command-smtp"></a> smtp
@@ -782,6 +785,7 @@ Name            | Description
 ----------------|--------------
 spop_address    | **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, "$address6$" otherwise.
 spop_port       | **Optional.** The host's port.
+spop_timeout    | **Optional.** The timeout in seconds.
 
 
 ## <a id="plugin-check-command-ssh"></a> ssh
diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index 508793194..d2e0e61cc 100644
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -557,6 +557,7 @@ object CheckCommand "imap" {
 	arguments = {
 		"-H" = "$imap_address$"
 		"-p" = "$imap_port$"
+		"-t" = "$imap_timeout$"
 	}
 
 	vars.imap_address = "$check_address$"
@@ -571,6 +572,7 @@ object CheckCommand "simap" {
 	arguments = {
 		"-H" = "$simap_address$"
 		"-p" = "$simap_port$"
+		"-t" = "$simap_timeout$"
 	}
 
 	vars.simap_address = "$check_address$"
@@ -585,6 +587,7 @@ object CheckCommand "pop" {
 	arguments = {
 		"-H" = "$pop_address$"
 		"-p" = "$pop_port$"
+		"-t" = "$pop_timeout$"
 	}
 
 	vars.pop_address = "$check_address$"
@@ -599,6 +602,7 @@ object CheckCommand "spop" {
 	arguments = {
 		"-H" = "$spop_address$"
 		"-p" = "$spop_port$"
+		"-t" = "$spop_timeout$"
 	}
 
 	vars.spop_address = "$check_address$"