diff --git a/imapd/imapd.conf b/imapd/imapd.conf
index 28e5e49d73..f13f4a69cc 100644
--- a/imapd/imapd.conf
+++ b/imapd/imapd.conf
@@ -3,6 +3,7 @@
 ##  Copyright (c) 2002 Ralf S. Engelschall <rse@engelschall.com>
 ##
 
+#   Warning: Do not use a trailing slash in paths!
 configdirectory:        @l_prefix@/var/imapd
 partition-default:      @l_prefix@/var/spool/imap
 admins:                 @l_musr@
diff --git a/imapd/imapd.spec b/imapd/imapd.spec
index 6f6bdcc2a4..675d976ad2 100644
--- a/imapd/imapd.spec
+++ b/imapd/imapd.spec
@@ -114,15 +114,14 @@ Provides:     IMAP
     #   install the run command file
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
     %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
+        -e 's;@l_musr@;%{l_musr};g' -e 's;@l_mgrp@;%{l_mgrp};g' \
         %{SOURCE rc.imapd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
     #   use mkimap to create many directories for us
     cp $RPM_BUILD_ROOT%{l_prefix}/etc/imapd/imapd.conf imapd.conf.hack
     %{l_shtool} subst -e "s;%{l_prefix};$RPM_BUILD_ROOT%{l_prefix};" \
         imapd.conf.hack
-    %{l_shtool} subst -e "s;/etc/imapd.conf;imapd.conf.hack;" \
-        tools/mkimap
-    tools/mkimap
+    tools/mkimap imapd.conf.hack
 
     #   determine files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
diff --git a/imapd/rc.imapd b/imapd/rc.imapd
index 3596df3f38..a010803889 100644
--- a/imapd/rc.imapd
+++ b/imapd/rc.imapd
@@ -1,33 +1,36 @@
 #!@l_prefix@/lib/openpkg/bash @l_prefix@/etc/rc
 ##
-##  rc.imapd -- Run-Commands for IMAP daemon
+##  rc.imapd -- Run-Commands for IMAP Daemon
 ##
 
 %config
     imapd_enable="yes"
 
-%start -p 200 -u root
+%start -p 200 -u @l_musr@
     if opServiceEnabled imapd; then
         @l_prefix@/bin/master &
+        echo $! > @l_prefix@/var/imapd/imapd.pid
     fi
 
-%stop -p 200 -u root
+%stop -p 200 -u @l_musr@
     if opServiceEnabled imapd; then
         if [ -f @l_prefix@/var/imapd/imapd.pid ]; then
             kill -TERM `cat @l_prefix@/var/imapd/imapd.pid`
+            rm @l_prefix@/var/imapd/imapd.pid
         fi
     fi
 
-%restart -u root
+%restart -u @l_musr@
     if opServiceEnabled imapd; then
         if [ -f @l_prefix@/var/imapd/imapd.pid ]; then
             kill -TERM `cat @l_prefix@/var/imapd/imapd.pid`
             sleep 2
         fi
         @l_prefix@/bin/master &
+        echo $! > @l_prefix@/var/imapd/imapd.pid
     fi
 
-%reload -u root
+%reload -u @l_musr@
     if opServiceEnabled imapd; then
         if [ -f @l_prefix@/var/imapd/imapd.pid ]; then
             kill -HUP `cat @l_prefix@/var/imapd/imapd.pid`