diff --git a/macros.icinga b/macros.icinga
index dabcac3..4559da7 100644
--- a/macros.icinga
+++ b/macros.icinga
@@ -80,3 +80,19 @@
 %icinga_command_user   wwwrun
 # Group, that can execute commands via %{icinga_command_file}
 %icinga_command_group  icingacmd
+
+# Add Icinga user and groups
+%icinga_user_group_add() \
+ /usr/sbin/groupadd -r %{icinga_group} 2>/dev/null || :\
+ /usr/sbin/useradd  -r -g %{icinga_group} -d %{icinga_localstatedir} -s /bin/false -c "User for Icinga" %{icinga_user} 2>/dev/null || :\
+ %{nil}
+
+%icinga_command_user_group_add() \
+ /usr/sbin/groupadd -r %{icinga_command_group} 2>/dev/null || :\
+ %if 0%{?suse_version} > 01220 \
+ /usr/sbin/usermod -a -G %{icinga_command_group} %{icinga_user} || :\
+ %else \
+ /usr/sbin/groupmod -A %{icinga_user} %{icinga_command_group} 2>/dev/null || :\
+ %endif \
+ %{nil}
+
diff --git a/macros.nagios b/macros.nagios
index fd5346f..e4029bf 100644
--- a/macros.nagios
+++ b/macros.nagios
@@ -25,6 +25,11 @@
 # Nagios cgi directory
 %nagios_cgidir          %{_prefix}/lib/nagios/cgi
 
+#
+# NRPE
+#
+%nrpe_sysconfdir        %{_sysconfdir}/nrpe.d
+
 #
 # files
 #
diff --git a/nagios-rpm-macros.changes b/nagios-rpm-macros.changes
index 08b201b..00640e5 100644
--- a/nagios-rpm-macros.changes
+++ b/nagios-rpm-macros.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Aug  7 20:56:02 UTC 2013 - lars@linux-schulserver.de
+
+- added new macros:
+  + %icinga_user_group_add
+  + %icinga_command_user_group_add
+  to make it easier to have the same useradd/groupadd invocations
+  in all packages
+
 -------------------------------------------------------------------
 Thu Apr 11 11:17:39 UTC 2013 - obs@botter.cc
 
diff --git a/nagios-rpm-macros.spec b/nagios-rpm-macros.spec
index c8b7179..d3849dc 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.06
+Version:        0.07
 Release:        0
 Url:            http://en.opensuse.org/Nagios
 Source0:        macros.nagios