diff --git a/ChangeLog b/ChangeLog
index 83ba3cd33..04452857e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-08  Badlop  <badlop@process-one.net>
+
+	* tools/ejabberdctl: Work also when 'which' is unavailable
+
 2008-07-08  Christophe Romain  <christophe.romain@process-one.net>
 
 	* src/web/ejabberd_http_poll.erl: improve ip fetching patch
diff --git a/tools/ejabberdctl b/tools/ejabberdctl
index 9d3f7bd5a..c821e8081 100755
--- a/tools/ejabberdctl
+++ b/tools/ejabberdctl
@@ -4,7 +4,8 @@ NODE=ejabberd
 HOST=localhost
 
 # Define ejabberd environment
-base="`dirname $(which "$0")`/.."
+here=`which "$0" 2>/dev/null || echo .`
+base="`dirname $here`/.."
 ROOTDIR=`(cd "$base"; echo $PWD)`
 SASL_LOG_PATH=$ROOTDIR/sasl.log
 EJABBERD_DB=$ROOTDIR/database/$NODE