diff --git a/tools/make-binaries b/tools/make-binaries
index 57aaaa7b6..a15a94224 100755
--- a/tools/make-binaries
+++ b/tools/make-binaries
@@ -367,6 +367,7 @@ edit_ejabberdctl()
 	    -e '/ERL_OPTIONS=/d' \
 	    -e 's|^ERLANG_NODE=ejabberd$|ERLANG_NODE=ejabberd@localhost|' \
 	    -e 's|_DIR:=".*}/|_DIR:="/opt/ejabberd/|' \
+	    -e 's|/database|/database/$ERLANG_NODE|' \
 	    "$code_dir/bin/${rel_name}ctl"
 }
 #.