diff --git a/macros.icinga b/macros.icinga
index 00cb82c..a1f948c 100644
--- a/macros.icinga
+++ b/macros.icinga
@@ -23,7 +23,7 @@
 # Icinga spool dir
 %icinga_spooldir        %{_var}/spool/icinga
 # Icinga run dir
-%icinga_rundir          %{_localstatedir}/run/icinga
+%icinga_rundir          %{_rundir}/icinga
 # Icinga logfile dir
 %icinga_logdir          %{_var}/log/icinga
 # Icinga cgi directory
diff --git a/macros.icinga2 b/macros.icinga2
index 59db6aa..85d97a6 100644
--- a/macros.icinga2
+++ b/macros.icinga2
@@ -23,7 +23,7 @@
 # Icinga spool dir
 %icinga2_spooldir        %{_var}/spool/icinga2
 # Icinga run dir
-%icinga2_rundir          %{_localstatedir}/run/icinga2
+%icinga2_rundir          %{_rundir}/icinga2
 # Icinga logfile dir
 %icinga2_logdir          %{_var}/log/icinga2
 # Icinga cgi directory
diff --git a/nagios-rpm-macros.changes b/nagios-rpm-macros.changes
index 84a4d3d..544073a 100644
--- a/nagios-rpm-macros.changes
+++ b/nagios-rpm-macros.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun 23 14:24:20 UTC 2014 - thardeck@suse.com
+
+- update to 0.10:
+  + adapt icinga[2] macros to use /run instead of /var/run on modern systems
+  + this change can easily be used for other macros, just use %{_rundir} instead of "%{_localstatedir}/run"
+
 -------------------------------------------------------------------
 Tue Apr 15 18:08:12 UTC 2014 - lars@linux-schulserver.de
 
diff --git a/nagios-rpm-macros.spec b/nagios-rpm-macros.spec
index e191f58..fed2f33 100644
--- a/nagios-rpm-macros.spec
+++ b/nagios-rpm-macros.spec
@@ -20,7 +20,7 @@ Name:           nagios-rpm-macros
 Summary:        RPM Macros for Nagios based packages
 License:        BSD-3-Clause
 Group:          System/Monitoring
-Version:        0.09
+Version:        0.10
 Release:        0
 Url:            http://en.opensuse.org/Nagios
 Source0:        macros.nagios
@@ -53,6 +53,11 @@ cat %{S:5} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios
 cat %{S:6} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios
 cat %{S:7} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios
 
+# make sure that _rundir is working on older systems
+%if ! %{defined _rundir}
+sed -i 's|%%{_rundir}|%%{_localstatedir}/run|' %{buildroot}%{_sysconfdir}/rpm/macros.nagios
+%endif
+
 %clean
 rm -rf %buildroot