diff --git a/mix.exs b/mix.exs
index d190e9da0..bb82b6471 100644
--- a/mix.exs
+++ b/mix.exs
@@ -271,8 +271,7 @@ defmodule Ejabberd.MixProject do
     Mix.Generator.copy_template("ejabberdctl.example1", "ejabberdctl.example2", assigns)
     execute.("sed -e 's|{{\\(\[_a-z\]*\\)}}|<%= @\\1 %>|g' ejabberdctl.example2> ejabberdctl.example2a")
     Mix.Generator.copy_template("ejabberdctl.example2a", "ejabberdctl.example2b", assigns)
-    execute.("sed -e 's|{{\\(\[_a-z\]*\\)}}|<%= @\\1 %>|g' ejabberdctl.example2b > ejabberdctl.example3")
-    execute.("sed -e 's|^ERLANG_NODE=ejabberd@localhost|ERLANG_NODE=ejabberd|g' ejabberdctl.example3 > ejabberdctl.example4")
+    execute.("sed -e 's|{{\\(\[_a-z\]*\\)}}|<%= @\\1 %>|g' ejabberdctl.example2b > ejabberdctl.example4")
     execute.("sed -e 's|^ERLANG_OPTS=\"|ERLANG_OPTS=\"-boot ../releases/#{release.version}/start_clean -boot_var RELEASE_LIB ../lib |' ejabberdctl.example4 > ejabberdctl.example5")
     execute.("sed -e 's|^INSTALLUSER=|ERL_OPTIONS=\"-setcookie \\$\\(cat \"\\${SCRIPT_DIR%/*}/releases/COOKIE\")\"\\nINSTALLUSER=|g' ejabberdctl.example5 > ejabberdctl.example6")
     Mix.Generator.copy_template("ejabberdctl.example6", "#{ro}/bin/ejabberdctl", assigns)
diff --git a/tools/make-binaries b/tools/make-binaries
index 442edfda4..d0398d6d3 100755
--- a/tools/make-binaries
+++ b/tools/make-binaries
@@ -409,7 +409,6 @@ edit_ejabberdctl()
 	sed -i \
 	    -e "2iexport TERM='internal'" \
 	    -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"