diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes
index 9eaf98f..2af874d 100644
--- a/rabbitmq-server.changes
+++ b/rabbitmq-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jan 18 12:23:09 UTC 2018 - vuntz@suse.com
+
+- Add TimeoutStartSec=300 to rabbitmq-server.service as enabling
+  HiPE can make the startup take much longer (documentation says
+  "a few minutes").
+
 -------------------------------------------------------------------
 Wed Dec 13 12:13:03 UTC 2017 - vuntz@suse.com
 
diff --git a/rabbitmq-server.service b/rabbitmq-server.service
index fd93837..ae93f17 100644
--- a/rabbitmq-server.service
+++ b/rabbitmq-server.service
@@ -12,6 +12,7 @@ NotifyAccess=all
 WorkingDirectory=/var/lib/rabbitmq
 ExecStart=/usr/sbin/rabbitmq-server
 ExecStop=/usr/sbin/rabbitmqctl stop
+TimeoutStartSec=300
 
 [Install]
 WantedBy=multi-user.target
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index debc702..78a525d 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package rabbitmq-server
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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