diff --git a/AUTHORS b/AUTHORS
index ce02af875..656c1db44 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,7 @@
 Alexander Wirt <formorer@debian.org>
 Bernd Erk <bernd.erk@icinga.org>
 Carlos Cesario <carloscesario@gmail.com>
+Gaël Beaudoin <gaboo@gaboo.org>
 Gerd von Egidy <gerd@egidy.de>
 Gunnar Beutner <gunnar.beutner@netways.de>
 Ildar Hizbulin <hizel@vyborg.ru>
diff --git a/doc/6-configuring-icinga-2.md b/doc/6-configuring-icinga-2.md
index d6ae9bafd..315982768 100644
--- a/doc/6-configuring-icinga-2.md
+++ b/doc/6-configuring-icinga-2.md
@@ -2035,6 +2035,7 @@ Name            | Description
 ----------------|--------------
 ssh_address     | **Optional.** The host's address. Defaults to "$address$".
 ssh_port        | **Optional.** The port that should be checked. Defaults to 22.
+ssh_timeout     | **Optional.** Seconds before connection times out. Defaults to 10.
 
 #### <a id="plugin-check-command-disk"></a> disk
 
diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index cd9d95acf..d33b05453 100644
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -312,6 +312,7 @@ object CheckCommand "ssh" {
 
 	arguments = {
 		"-p" = "$ssh_port$"
+		"-t" = "$ssh_timeout$"
 		"host" = {
 			value = "$ssh_address$"
 			skip_key = true