diff -up shinken-0.5.5/bin/default/shinken.in.init shinken-0.5.5/bin/default/shinken.in
--- shinken-0.5.5/bin/default/shinken.in.init	2011-04-06 11:47:44.000000000 +0200
+++ shinken-0.5.5/bin/default/shinken.in	2011-04-06 11:04:27.000000000 +0200
@@ -5,9 +5,9 @@
 
 
 ## These vars will overRide the hardcoded ones in init script
-ETC=$ETC$
-VAR=$VAR$
-BIN=$SCRIPTS_BIN$
+ETC=$ETC
+VAR=$VAR
+BIN=$BIN
 
 
 ###ARBITER PART
diff -up shinken-0.5.5/bin/init.d/shinken.init shinken-0.5.5/bin/init.d/shinken
--- shinken-0.5.5/bin/init.d/shinken.init	2011-04-06 11:47:47.000000000 +0200
+++ shinken-0.5.5/bin/init.d/shinken	2011-04-06 11:48:16.000000000 +0200
@@ -14,8 +14,14 @@
 #     - broker      : manage results by looking at scheduler. Like export to flat file or db.
 #     - reactionner : manage the failed checks by looking at scheduler. 
 #     - receiver    : manage all passive data
+#
 ### END INIT INFO
 
+# Fedora/RHEL test
+if [ -e "/etc/redhat-release" ] || [ -e "/etc/fedora-release" ]; then
+  ISREDHAT=true
+fi
+
 NAME="shinken"
 
 AVAIL_MODULES="scheduler poller reactionner broker receiver arbiter"
@@ -31,9 +37,10 @@ fi
 curpath=$(dirname "$0")
 
 ## Default paths :
-BIN="/usr/local/shinken/bin"
-VAR="/usr/local/shinken/var"
-ETC="/usr/local/shinken/etc"
+BIN="/usr/sbin"
+VAR="var/run/shinken"
+ETC="/etc/shinken"
+LOG="/var/log/shinken"
 
 export PATH="${PATH:+$PATH:}/usr/sbin:/bin:/sbin"
 
@@ -198,25 +205,37 @@ do_action() {
     }
 
     $DEBUG && {
-	echo "Debugging informations will be saved in $VAR/${mod}-debug.log"
-	DEBUGCMD="--debug $VAR/${mod}-debug.log"
+	echo "Debugging informations will be saved in $LOG/${mod}-debug.log"
+	DEBUGCMD="--debug $LOG/${mod}-debug.log"
     }
     OPT="-d -c ${SHINKENCFG} -c ${SHINKENSPECIFICCFG}"
     [ "$mod" != "arbiter" ] && OPT="-d -c ${configfile}"
     case $action in
 	start)
-	    log_progress_msg "Starting $mod daemon: "
-	    start-stop-daemon --start -v --pidfile $pidfile --retry 3 --exec /usr/bin/python -- $daemon $OPT $DEBUGCMD > /dev/null
-	    rt=$?
+	    if [ $ISREDHAT ]; then
+		echo -n $"Starting $mod: "
+		start_daemon $daemon $OPT $DEBUGCMD > /dev/null
+		rt=$?
+	    else
+		log_progress_msg "Starting $mod daemon: "
+		start-stop-daemon --start -v --pidfile $pidfile --retry 3 --exec /usr/bin/python -- $daemon $OPT $DEBUGCMD > /dev/null
+		rt=$?
+	    fi;
 	    
 	    [ $rt -eq 0 ] && log_success_msg "started" || log_failure_msg "failed: $!"
 	    ;;
 	stop)
-	    log_progress_msg "Stopping $mod daemon: "
-	    start-stop-daemon --stop -v -m --pidfile $pidfile --retry 3 > /dev/null
-	    rt=$?
+	    if [ $ISREDHAT ]; then
+		echo -n $"Stopping $mod: "
+		killproc -p /$pidfile
+		rt=$?
+	    else
+		log_progress_msg "Stopping $mod daemon: "
+		start-stop-daemon --stop -v -m --pidfile $pidfile --retry 3 > /dev/null
+		rt=$?
+	    fi;
 	    
-	    [ $rt -eq 0 ] && { 
+	    [ $rt -eq 0 ] && {
 		rm -f $pidfile 
 		log_success_msg "stopped" 
 	    } || log_failure_msg "failed: $!"