Index: bstat
===================================================================
--- bstat	(revision 413650)
+++ bstat	(working copy)
@@ -136,7 +136,14 @@
 ACTIVEMQ_TASK="query"
 
 BROKER_NAME=$1
-if [ -z "$BROKER_NAME" ] ; then
+if [ "$BROKER_NAME" = "--help" -o "$BROKER_NAME" = "-h" -o "$BROKER_NAME" = "-?" ] ; then 
+    echo
+    echo Performs a predefined query that displays useful statistics regarding the specified broker.
+    echo If no broker name is specified, it will try and select from all registered brokers.
+    echo Usage: bstat [brokerName] [--jmxurl url]
+    echo
+    exit 0
+elif [ -z "$BROKER_NAME" ] ; then
     BROKER_NAME="*"
 fi
 shift
Index: bstat.bat
===================================================================
--- bstat.bat	(revision 413650)
+++ bstat.bat	(working copy)
@@ -30,7 +30,11 @@
 
 rem Assume first parameter is broker name
 set BROKER_NAME=%1
+if "%BROKER_NAME%" == "--help" goto dispHelp
+if "%BROKER_NAME%" == "-h" goto dispHelp
+if "%BROKER_NAME%" == "-?" goto dispHelp
 if "%BROKER_NAME%" == "" set BROKER_NAME=*
+
 shift
 
 rem Slurp the command line arguments. This loop allows for an unlimited number
@@ -111,10 +115,18 @@
 
 "%_JAVACMD%" %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS% -Djava.ext.dirs="%JAVA_EXT_DIRS%" -classpath "%LOCALCLASSPATH%" -jar "%ACTIVEMQ_HOME%/bin/run.jar" %ACTIVEMQ_TASK% %QUERY_PARAM% %ACTIVEMQ_CMD_LINE_ARGS%
 
+goto end
 
+:dispHelp
+
+echo.
+echo Performs a predefined query that displays useful statistics regarding the specified broker.
+echo If no broker name is specified, it will try and select from all registered brokers.
+echo Usage: bstat [brokerName] [--jmxurl url]
+echo.
+
 goto end
 
-
 :end
 set LOCALCLASSPATH=
 set _JAVACMD=