diff --git a/munin-node.service b/munin-node.service
index 3318bca..ed49b44 100644
--- a/munin-node.service
+++ b/munin-node.service
@@ -5,6 +5,7 @@ Requires=network.target
 [Service]
 Type=forking
 ExecStart=/usr/sbin/munin-node
+ExecStartPre=/usr/bin/mkdir -p /var/run/munin/
 PIDFile=/var/run/munin/munin-node.pid
 
 [Install]
diff --git a/munin.changes b/munin.changes
index 4e5c47e..635d6e4 100644
--- a/munin.changes
+++ b/munin.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Aug  2 05:52:38 UTC 2015 - bwiedemann@suse.com
+
+- fix munin-node start (bnc#940287)
+
 -------------------------------------------------------------------
 Wed Jan  7 08:07:48 UTC 2015 - wr@rosenauer.org
 
diff --git a/munin.spec b/munin.spec
index 519f06b..774448a 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package munin
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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