3 files changed, 12 insertions, 2 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 5a3e73bcaa..8a1b4d6510 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -60,7 +60,7 @@ fi
 [ "x" = "x$RABBITMQ_USE_LONGNAME" ] && RABBITMQ_USE_LONGNAME=${USE_LONGNAME}
 if [ "xtrue" = "x$RABBITMQ_USE_LONGNAME" ] ; then
     RABBITMQ_NAME_TYPE=-name
-    [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname --fqdn`
+    [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname -f`
     [ "x" = "x$NODENAME" ] && NODENAME=rabbit@${HOSTNAME}
 else
     RABBITMQ_NAME_TYPE=-sname
diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins
index 22fec32f0a..d595620042 100755
--- a/scripts/rabbitmq-plugins
+++ b/scripts/rabbitmq-plugins
@@ -24,6 +24,7 @@ exec ${ERL_DIR}erl \
     -pa "${RABBITMQ_HOME}/ebin" \
     -noinput \
     -hidden \
+    ${RABBITMQ_PLUGINS_ERL_ARGS} \
     -boot "${CLEAN_BOOT_FILE}" \
     -s rabbit_plugins_main \
     -enabled_plugins_file "$RABBITMQ_ENABLED_PLUGINS_FILE" \
diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat
index b27a8586b2..a5b441ce17 100755
--- a/scripts/rabbitmq-plugins.bat
+++ b/scripts/rabbitmq-plugins.bat
@@ -55,7 +55,16 @@ if "!RABBITMQ_PLUGINS_DIR!"=="" (
     set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins
 )
 
-"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden -s rabbit_plugins_main -enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" -plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" -nodename !RABBITMQ_NODENAME! -extra !STAR!
+"!ERLANG_HOME!\bin\erl.exe" ^
+-pa "!TDP0!..\ebin" ^
+-noinput ^
+-hidden ^
+!RABBITMQ_CTL_ERL_ARGS! ^
+-s rabbit_plugins_main ^
+-enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^
+-plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" ^
+-nodename !RABBITMQ_NODENAME! ^
+-extra !STAR!
 
 endlocal
 endlocal