diff --git a/PKGBUILD b/PKGBUILD
index 678fe11..3eba675 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=('munin' 'munin-node')
 pkgbase=munin
 pkgver=1.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A distributed monitoring/graphing tool"
 arch=('any')
 url="http://munin.projects.linpro.no/"
diff --git a/munin-node.init b/munin-node.init
index ed679fd..cd770f3 100755
--- a/munin-node.init
+++ b/munin-node.init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 . /etc/rc.conf
 . /etc/rc.d/functions
diff --git a/munin-node.install b/munin-node.install
index 4569f19..3894e5c 100644
--- a/munin-node.install
+++ b/munin-node.install
@@ -1,7 +1,7 @@
 post_install () {
   # Check user/group munin exists
-  getent group munin >/dev/null || groupadd munin
-  getent passwd munin >/dev/null || useradd -c "Munin system monitor" -g munin -s /bin/false -d /var/lib/munin munin
+  getent group munin >/dev/null || groupadd -r munin
+  getent passwd munin >/dev/null || useradd -r -c "Munin system monitor" -g munin -s /bin/false -d /var/lib/munin munin
   # Fix permissions
   chown munin.munin -R /var/log/munin /var/lib/munin /var/run/munin
   # Do basic configuration