diff --git a/src/pmcd/rc_pmcd b/src/pmcd/rc_pmcd
index e4adf96..f82bbc3 100644
--- a/src/pmcd/rc_pmcd
+++ b/src/pmcd/rc_pmcd
@@ -98,8 +98,10 @@ _reboot_setup()
     #
     if [ ! -d "$PCP_RUN_DIR" ]
     then
-	mkdir -p -m 755 "$PCP_RUN_DIR"
+	mkdir -p "$PCP_RUN_DIR"
     fi
+    chgrp $PCP_GROUP "$PCP_RUN_DIR"
+    chmod 777 "$PCP_RUN_DIR"
 
     # setup and clean up base directories and house-keeping for tracking
     # pmlogger instances ... needs to be done here because pmcd needs the
@@ -275,6 +277,7 @@ _shutdown()
     then
  	[ "$1" = verbose ] && echo "$prog: pmcd not running"
 	rm -f $PCP_RUN_DIR/pmcd.pid
+	rm -f $PCP_RUN_DIR/pmcd.socket
 	return 0
     fi
 
@@ -327,6 +330,7 @@ Warning: process ID in $PCP_RUN_DIR/pmcd.pid is $TOKILL.
 	else
 	    pmsignal -s $SIG $TOKILL >/dev/null 2>&1
 	    rm -f $PCP_RUN_DIR/pmcd.pid
+	    rm -f $PCP_RUN_DIR/pmcd.socket
 	fi
 	while [ $delay -gt 0 ]
 	do