diff --git a/Scripts/sogo-init.d-redhat b/Scripts/sogo-init.d-redhat
index def0f10df..63cd8e1c8 100755
--- a/Scripts/sogo-init.d-redhat
+++ b/Scripts/sogo-init.d-redhat
@@ -41,7 +41,7 @@ then
   . /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
 fi
 
-REAL_DAEMON=$GNUSTEP_SYSTEM_ROOT/Tools/sogod-0.9
+REAL_DAEMON=sogod-0.9
 DAEMON=/usr/sbin/sogod
 NAME=sogo
 DESC="Scalable OpenGroupware.Org (Inverse edition)"
@@ -76,18 +76,16 @@ fi
 
 case "$1" in
   start)
-	echo -n $"Starting $DESC: "
+	echo $"Starting $DESC: "
 	for ((a=1; a <= PREFORK ; a++))
 	do
-	  daemon su - sogo -c "$DAEMON $a"
+	  daemon --user=sogo $DAEMON $a
+	  echo "$DAEMON $a"
 	done
-#	daemon --user sogo --pidfile $PIDFILE $DAEMON
-	echo "$NAME."
 	;;
   stop)
 	echo -n $"Stopping $DESC: "
-	killproc `basename $REAL_DAEMON` && rm -f ${PIDFILE}*
-#	killproc -p $PIDFILE $REAL_DAEMON && rm -f $PIDFILE
+	killproc $REAL_DAEMON && rm -f ${PIDFILE}*
 	echo "$NAME."
 	;;
   restart|force-reload)
diff --git a/Scripts/sogod-0.9-redhat b/Scripts/sogod-0.9-redhat
index afd934bea..43357c3de 100755
--- a/Scripts/sogod-0.9-redhat
+++ b/Scripts/sogod-0.9-redhat
@@ -25,6 +25,15 @@ PIDFILE=/var/run/sogo/sogod.$1
 
 . /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
 
+if [ -f $GNUSTEP_USER_ROOT/Tools/sogod-0.9 ]; then
+    sogod="$GNUSTEP_USER_ROOT/Tools/sogod-0.9"
+elif [ -f $GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9 ]; then
+    sogod="$GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9"
+else
+    echo "Can't find sogod-0.9"
+    exit 1
+fi
+
 echo $$ > $PIDFILE
 
 startport=`defaults read sogod-0.9 WOPort`
@@ -36,4 +45,4 @@ else
 fi
 
 let "port=$startport + $1 - 1"
-exec $GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9 -WOPort $port >& /var/log/sogo/sogod-$port.log
+exec $sogod -WOPort $port >& /var/log/sogo/sogod-$port.log &