diff --git a/ChangeLog b/ChangeLog
index 37539a77e..c9d20ee52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-27  Christophe Romain  <christophe.romain@process-one.net>
+
+	* src/ejabberdctl.template: apply rootdir patch from Badlop (EJAB-385)
+	* tools/ejabberdctl: define EJABBERD_EBIN as from ejabberdctl.template
+    
 2007-09-25  Alexey Shchepin  <alexey@process-one.net>
 
 	* src/ejabberd_s2s.erl: Max number of connections and max number
diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
index 3c77ec593..f117c21e3 100644
--- a/src/ejabberdctl.template
+++ b/src/ejabberdctl.template
@@ -4,9 +4,10 @@ NODE=ejabberd
 HOST=localhost
 
 # Define ejabberd environment
-ROOTDIR=@prefix@
+ROOTDIR=@rootdir@
 SASL_LOG_PATH=$ROOTDIR/var/log/ejabberd/sasl.log
 EJABBERD_DB=$ROOTDIR/var/lib/ejabberd/db/$NODE
+EJABBERD_EBIN=$ROOTDIR/var/lib/ejabberd/ebin
 export EJABBERD_LOG_PATH=$ROOTDIR/var/log/ejabberd/ejabberd.log
 export EJABBERD_CONFIG_PATH=$ROOTDIR/etc/ejabberd/ejabberd.cfg
 export EJABBERD_MSGS_PATH=$ROOTDIR/var/lib/ejabberd/priv/msgs
@@ -20,7 +21,7 @@ function start
     erl \
       -noinput -detached \
       -sname $NODE@$HOST \
-      -pa $ROOTDIR/src \
+      -pa $EJABBERD_EBIN \
       -mnesia dir "\"$EJABBERD_DB\"" \
       -s ejabberd \
       -ejabberd config \"$EJABBERD_CONFIG_PATH\" \
@@ -32,7 +33,7 @@ function debug
 {
     erl \
       -sname debug$NODE@$HOST \
-      -pa $ROOTDIR/src \
+      -pa $EJABBERD_EBIN \
       -mnesia dir "\"$EJABBERD_DB\"" \
       -remsh $NODE@$HOST
 }
@@ -42,7 +43,7 @@ function ctl
     erl \
       -noinput \
       -sname ejabberdctl@$HOST \
-      -pa $ROOTDIR/src \
+      -pa $EJABBERD_EBIN \
       -s ejabberd_ctl -extra $NODE@$HOST $@
 }
 
diff --git a/tools/ejabberdctl b/tools/ejabberdctl
index f4e134b34..8b16785d8 100755
--- a/tools/ejabberdctl
+++ b/tools/ejabberdctl
@@ -8,6 +8,7 @@ base="`dirname $(which "$0")`/.."
 ROOTDIR=`(cd "$base"; echo $PWD)`
 SASL_LOG_PATH=$ROOTDIR/sasl.log
 EJABBERD_DB=$ROOTDIR/database/$NODE
+EJABBERD_EBIN=$ROOTDIR/src
 export EJABBERD_LOG_PATH=$ROOTDIR/ejabberd.log
 export EJABBERD_CONFIG_PATH=$ROOTDIR/ejabberd.cfg
 export EJABBERD_MSGS_PATH=$ROOTDIR/src/msgs
@@ -22,7 +23,7 @@ function start
     erl \
       -noinput -detached \
       -sname $NODE@$HOST \
-      -pa $ROOTDIR/src \
+      -pa $EJABBERD_EBIN \
       -mnesia dir "\"$EJABBERD_DB\"" \
       -s ejabberd \
       -ejabberd config \"$EJABBERD_CONFIG_PATH\" \
@@ -34,7 +35,7 @@ function debug
 {
     erl \
       -sname debug$NODE@$HOST \
-      -pa $ROOTDIR/src \
+      -pa $EJABBERD_EBIN \
       -mnesia dir "\"$EJABBERD_DB\"" \
       -remsh $NODE@$HOST
 }
@@ -44,7 +45,7 @@ function ctl
     erl \
       -noinput \
       -sname ejabberdctl@$HOST \
-      -pa $ROOTDIR/src \
+      -pa $EJABBERD_EBIN \
       -s ejabberd_ctl -extra $NODE@$HOST $@
 }