diff --git a/Scripts/sogo-init.d-redhat b/Scripts/sogo-init.d-redhat
index 3c04063d9..ad94d06bf 100755
--- a/Scripts/sogo-init.d-redhat
+++ b/Scripts/sogo-init.d-redhat
@@ -1,10 +1,21 @@
-#!/bin/sh
+#!/bin/bash
+#
+# sogod		Scalable OpenGroupware.org (Inverse edition)
+#
+# chkconfig:	- 85 15
+# description:	SOGo is a groupware server
+# processname:  sogod-0.9
+# config:	/etc/sysconfig/sogo
+# config:	/etc/httpd/conf.d/SOGo.conf
+# pidfile:	/var/run/sogo/sogod.pid
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
+. /etc/rc.d/init.d/functions
+
 DAEMON=/usr/sbin/sogod
 NAME=sogo
-DESC="Scalable OpenGroupware.Org"
+DESC="Scalable OpenGroupware.Org (Inverse edition)"
 
 PIDFILE=/var/run/sogo/sogod.pid
 
@@ -14,35 +25,36 @@ if [ -f /etc/sysconfig/sogo ]; then
     . /etc/sysconfig/sogo
 fi
 
-. /etc/init.d/functions
-
 test -x $DAEMON || exit 0
 
 #set -e
 
 case "$1" in
   start)
-	echo -n "Starting $DESC: "
-	daemon $DAEMON
+	echo -n $"Starting $DESC: " / 
+	daemon --user sogo --pidfile $PIDFILE $DAEMON
 	echo "$NAME."
 	;;
   stop)
-	echo -n "Stopping $DESC: "
-	killall sogod-0.9 2> /dev/null
+	echo -n $"Stopping $DESC: "
+	killproc --pidfile $PIDFILE $DAEMON
 	rm -f $PIDFILE
 	echo "$NAME."
 	;;
   restart|force-reload)
-	echo -n "Restarting $DESC: "
-	killall sogod-0.9 2> /dev/null
+	echo -n $"Restarting $DESC: "
+	killproc --pidfile $PIDFILE $DAEMON
 	rm -f $PIDFILE
 	sleep 1
-	daemon $DAEMON
+	daemon --user sogo --pidfile $PIDFILE $DAEMON
 	echo "$NAME."
 	;;
+  status)
+  	status $DAEMON
+	;;
   *)
 	N=/etc/init.d/$NAME
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
 	exit 1
 	;;
 esac
diff --git a/Scripts/sogod-redhat b/Scripts/sogod-redhat
index 99584cece..03cb492ab 100755
--- a/Scripts/sogod-redhat
+++ b/Scripts/sogod-redhat
@@ -2,8 +2,7 @@
 
 PIDFILE=/var/run/sogo/sogod.pid
 
-. /usr/lib/GNUstep/System/Library/Makefiles/GNUstep.sh
+. /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
 
 echo $$ > $PIDFILE
-exec $GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9 >& /var/log/sogo/sogod.log
-
+exec $GNUSTEP_SYSTEM_ROOT/Tools/sogod-0.9 >& /var/log/sogo/sogod.log