diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec
index e76d15a..f64bb63 100644
--- a/openssh-askpass-gnome.spec
+++ b/openssh-askpass-gnome.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openssh-askpass-gnome
 #
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/openssh.changes b/openssh.changes
index 75dcc5a..ba740ee 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 22 19:31:08 UTC 2017 - crrodriguez@opensuse.org
+
+- sshd.service: Set TasksMax=infinity, as there should be
+  no limit on the amount of tasks sshd can run. 
+
 -------------------------------------------------------------------
 Thu Sep 29 23:27:49 UTC 2016 - pcerny@suse.com
 
diff --git a/openssh.spec b/openssh.spec
index 8a0d1f6..0f3fab6 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openssh
 #
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/sshd.service b/sshd.service
index 2c02aa5..f455f1c 100644
--- a/sshd.service
+++ b/sshd.service
@@ -9,6 +9,7 @@ ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=always
+TasksMax=infinity
 
 [Install]
 WantedBy=multi-user.target