diff --git a/ChangeLog b/ChangeLog
index 00a725255..ae4ef326a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-28  Christophe Romain  <christophe.romain@process-one.net>
+
+	* src/ejabberdctl.template: Bugfix on previous change (EJAB-380)
+
 2007-10-17  Alexey Shchepin  <alexey@process-one.net>
 
 	* src/ejabberdctl.template: Several improvements (EJAB-380)
diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
index bfd13988f..106852fcf 100644
--- a/src/ejabberdctl.template
+++ b/src/ejabberdctl.template
@@ -43,7 +43,6 @@ function start
       $SNAME $ERLANG_NODE \
       $ERLANG_OPTS \
       -noinput -detached \
-      -sname $NODE@$HOST \
       -pa $EJABBERD_EBIN \
       -mnesia dir "\"$EJABBERD_DB\"" \
       -s ejabberd \
@@ -102,8 +101,8 @@ function live
 function ctl
 {
     erl \
+      $SNAME ejabberdctl \
       -noinput \
-      -sname ejabberdctl@$HOST \
       -pa $EJABBERD_EBIN \
       -s ejabberd_ctl -extra $ERLANG_NODE $@
     case $? in