-diff --git shinken.orig/bin/init.d/shinken shinken/bin/init.d/shinken
-index ce51dcc..65018e3 100755
---- shinken.orig/bin/init.d/shinken
-+++ shinken/bin/init.d/shinken
-@@ -165,10 +165,6 @@
+diff --git a/bin/init.d/shinken b/bin/init.d/shinken
+index 5e7e495..89dedc2 100755
+--- a/bin/init.d/shinken
++++ b/bin/init.d/shinken
+@@ -43,6 +43,19 @@
+ 
+ NAME="shinken"
+ 
++
++## This permits to overhidde the default "default shinken cfg file":
++[ -z "$SHINKEN_DEFAULT_FILE" ] && SHINKEN_DEFAULT_FILE="/etc/default/$NAME"
++## so you can now do:
++## bash -c "SHINKEN_DEFAULT_FILE=$your_own_default_file $init_path/shinken $action $args"
++## to easily use your own config
++
++#echo "Using $SHINKEN_DEFAULT_FILE .."
++
++# Reads configuration variable file if it is present
++[ -r "$SHINKEN_DEFAULT_FILE" ] && . "$SHINKEN_DEFAULT_FILE"
++
++
+ ## SHINKEN_MODULE_FILE is set by shinken-* if it's one of these that's calling us.
+ if [ -z "$SHINKEN_MODULE_FILE" ]; then
+     SCRIPTNAME=$0
+@@ -106,16 +119,6 @@ DEBUG=false
+ CMD=""
+ SUBMODULES=""
+ 
+-## This permits to overhidde the default "default shinken cfg file":
+-[ -z "$SHINKEN_DEFAULT_FILE" ] && SHINKEN_DEFAULT_FILE="/etc/default/$NAME"
+-## so you can now do:
+-## bash -c "SHINKEN_DEFAULT_FILE=$your_own_default_file $init_path/shinken $action $args"
+-## to easily use your own config
+-
+-#echo "Using $SHINKEN_DEFAULT_FILE .."
+-
+-
+-
+ usage() {
+     cat << END
+ Usage: $SCRIPTNAME [ -d ] {start|stop|restart|status|check} $_usage_mods_
+@@ -152,20 +155,11 @@ else
+     done
+ fi
+ 
+-
+-# Reads configuration variable file if it is present
+-[ -r "$SHINKEN_DEFAULT_FILE" ] && . "$SHINKEN_DEFAULT_FILE"
+-
+-
+ # Now look if some required variables are pre defined:
+ if ! test "$SHINKENCFG"
  then
      SHINKENCFG="$ETC/nagios.cfg"
  fi

 
 # If var or run dir is missing, create them and chown them
 [ ! -d $VAR ] && mkdir -p $VAR && chown $SHINKENUSER:$SHINKENGROUP $VAR
@@ -287,13 +283,20 @@
     [ "$DEBUG" = 1 ] && DEBUGCMD="--debug "$(getdebugfile "$mod")
     # Skonf need skonf.cfg, arbiter nagios.cfg, and the other OTHERd.ini
     if [ "$mod" = 'skonf' ]; then

         rc=$?
     fi
     # debug:
@@ -373,7 +374,13 @@ do_stop() {
 #
 do_check() {
     [ "$DEBUG" = 1 ] && DEBUGCMD="--debug $VAR/${mod}-debug.log"
