diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes
index 2ec02a7..421954f 100644
--- a/rabbitmq-server.changes
+++ b/rabbitmq-server.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May 28 13:08:15 UTC 2018 - bwiedemann@suse.com
+
+- Add TasksMax=8192 to start on large machines (bsc#1094896)
+
 -------------------------------------------------------------------
 Mon Jan 22 19:19:19 UTC 2018 - vuntz@suse.com
 
diff --git a/rabbitmq-server.service b/rabbitmq-server.service
index ae93f17..3b60465 100644
--- a/rabbitmq-server.service
+++ b/rabbitmq-server.service
@@ -13,6 +13,8 @@ WorkingDirectory=/var/lib/rabbitmq
 ExecStart=/usr/sbin/rabbitmq-server
 ExecStop=/usr/sbin/rabbitmqctl stop
 TimeoutStartSec=300
+# required on machines with many cores (bsc#1094896):
+TasksMax=8192
 
 [Install]
 WantedBy=multi-user.target