diff --git a/jboss/src/plugin-resources/run.bat b/jboss/src/plugin-resources/run.bat
index 495b83bc..c7d20a36 100755
--- a/jboss/src/plugin-resources/run.bat
+++ b/jboss/src/plugin-resources/run.bat
@@ -2,5 +2,7 @@
@REM Default JBoss start up batch script. It calls the default script found
@REM in JBOSS_HOME/bin.
@REM ----------------------------------------------------------------------------
+@if "%OS%" == "Windows_NT" setlocal
+@set NOPAUSE=true
@set JAVA_OPTS="-Djboss.server.home.dir=@jboss.server.home.dir@" "-Djboss.server.home.url=@jboss.server.home.url@"
@call @maven.jboss.home@\bin\run.bat -c @maven.jboss.conf.name@
diff --git a/jboss/src/plugin-resources/shutdown.3.0.bat b/jboss/src/plugin-resources/shutdown.3.0.bat
index b17199f4..c9ab8d4e 100755
--- a/jboss/src/plugin-resources/shutdown.3.0.bat
+++ b/jboss/src/plugin-resources/shutdown.3.0.bat
@@ -3,5 +3,7 @@ REM ----------------------------------------------------------------------------
REM Default JBoss shutdown batch script. It calls the default script found
REM in JBOSS_HOME/bin.
REM ----------------------------------------------------------------------------
+@if "%OS%" == "Windows_NT" setlocal
+@set NOPAUSE=true
call @maven.jboss.home@\bin\shutdown.bat @maven.jboss.hostname@
diff --git a/jboss/src/plugin-resources/shutdown.3.2.bat b/jboss/src/plugin-resources/shutdown.3.2.bat
index 3cf0f1c3..1a25a4e2 100755
--- a/jboss/src/plugin-resources/shutdown.3.2.bat
+++ b/jboss/src/plugin-resources/shutdown.3.2.bat
@@ -3,4 +3,6 @@ REM ----------------------------------------------------------------------------
REM Default JBoss shutdown batch script. It calls the default script found
REM in JBOSS_HOME/bin.
REM ----------------------------------------------------------------------------
+@if "%OS%" == "Windows_NT" setlocal
+@set NOPAUSE=true
call @maven.jboss.home@\bin\shutdown.bat -S
diff --git a/jboss/xdocs/changes.xml b/jboss/xdocs/changes.xml
index 07ee74d9..f29e404e 100644
--- a/jboss/xdocs/changes.xml
+++ b/jboss/xdocs/changes.xml
@@ -8,6 +8,9 @@
+
+ Fix jboss:shutdown and jboss:start hanging on pause.
+