diff --git a/scripts/rabbitmq-diagnostics.bat b/scripts/rabbitmq-diagnostics.bat
index 58b6c69e4f..311cfa3f5e 100644
--- a/scripts/rabbitmq-diagnostics.bat
+++ b/scripts/rabbitmq-diagnostics.bat
@@ -49,6 +49,8 @@ if not defined ERL_CRASH_DUMP_SECONDS (
 -boot !CLEAN_BOOT_FILE! ^
 -noinput -noshell -hidden -smp enable ^
 !RABBITMQ_CTL_ERL_ARGS! ^
+-kernel inet_dist_listen_min !RABBITMQ_CTL_DIST_PORT_MIN! ^
+-kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
 -sasl errlog_type error ^
 -mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^
 -nodename !RABBITMQ_NODENAME! ^
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index 4e23cdcd0e..1443050cb3 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -333,11 +333,21 @@ if "!ERL_CRASH_DUMP!"=="" (
 )
 
 REM [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS}
-if "!$RABBITMQ_CTL_ERL_ARGS!"=="" (
+if "!RABBITMQ_CTL_ERL_ARGS!"=="" (
     if not "!CTL_ERL_ARGS!"=="" (
         set RABBITMQ_CTL_ERL_ARGS=!CTL_ERL_ARGS!
     )
 )
+if "!RABBITMQ_CTL_DIST_PORT_MIN!"=="" (
+    if not "!CTL_DIST_PORT_MIN!"=="" (
+        set RABBITMQ_CTL_DIST_PORT_MIN=!CTL_DIST_PORT_MIN!
+    )
+)
+if "!RABBITMQ_CTL_DIST_PORT_MAX!"=="" (
+    if not "!CTL_DIST_PORT_MAX!"=="" (
+        set RABBITMQ_CTL_DIST_PORT_MAX=!CTL_DIST_PORT_MAX!
+    )
+)
 
 REM ADDITIONAL WINDOWS ONLY CONFIG ITEMS
 REM rabbitmq-plugins.bat
diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat
index 443201e2f0..17471291cb 100644
--- a/scripts/rabbitmq-plugins.bat
+++ b/scripts/rabbitmq-plugins.bat
@@ -49,6 +49,8 @@ if not defined ERL_CRASH_DUMP_SECONDS (
 -boot !CLEAN_BOOT_FILE! ^
 -noinput -noshell -hidden -smp enable ^
 !RABBITMQ_CTL_ERL_ARGS! ^
+-kernel inet_dist_listen_min !RABBITMQ_CTL_DIST_PORT_MIN! ^
+-kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
 -sasl errlog_type error ^
 -mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^
 -nodename !RABBITMQ_NODENAME! ^
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat
index 4980900f72..de94df6d57 100644
--- a/scripts/rabbitmqctl.bat
+++ b/scripts/rabbitmqctl.bat
@@ -49,6 +49,8 @@ if not defined ERL_CRASH_DUMP_SECONDS (
 -boot !CLEAN_BOOT_FILE! ^
 -noinput -noshell -hidden -smp enable ^
 !RABBITMQ_CTL_ERL_ARGS! ^
+-kernel inet_dist_listen_min !RABBITMQ_CTL_DIST_PORT_MIN! ^
+-kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
 -sasl errlog_type error ^
 -mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^
 -nodename !RABBITMQ_NODENAME! ^