diff --git a/jsdoc.cmd b/jsdoc.cmd
index 3d8937dd..96db593b 100644
--- a/jsdoc.cmd
+++ b/jsdoc.cmd
@@ -21,17 +21,25 @@ IF NOT "%_URLPATH%"=="%_URLPATH: =%" GOTO ESCAPE_SPACE
 IF [%1]==[--debug] (
     ECHO Running Debug
     SET CMD=org.mozilla.javascript.tools.debugger.Main -debug
+
+    REM `SHIFT` doesn't affect %*
+    :COLLECT_ARGS
+    IF [%2]==[] GOTO LAST_ARG
+    SET ARGS=%ARGS% %2
     SHIFT
+    GOTO COLLECT_ARGS
 ) ELSE (
     SET CMD=org.mozilla.javascript.tools.shell.Main
+    SET ARGS=%*
 )
+:LAST_ARG
 
 IF [%1]==[-T] (
     ECHO Running Tests
-    java -classpath "%_BASEPATH%/lib/js.jar" %CMD% -opt -1 -modules "%_URLPATH%/node_modules" -modules "%_URLPATH%/rhino_modules" -modules "%_URLPATH%" "%_BASEPATH%/jsdoc.js" %* --dirname="%_BASEPATH%/
+    java -classpath "%_BASEPATH%/lib/js.jar" %CMD% -opt -1 -modules "%_URLPATH%/node_modules" -modules "%_URLPATH%/rhino_modules" -modules "%_URLPATH%" "%_BASEPATH%/jsdoc.js" %ARGS% --dirname="%_BASEPATH%/
 ) ELSE (
     REM normal mode should be quiet
-    java -classpath "%_BASEPATH%/lib/js.jar" %CMD% -modules "%_URLPATH%/node_modules" -modules "%_URLPATH%/rhino_modules" -modules "%_URLPATH%" "%_BASEPATH%/jsdoc.js" %* --dirname="%_BASEPATH%/
+    java -classpath "%_BASEPATH%/lib/js.jar" %CMD% -modules "%_URLPATH%/node_modules" -modules "%_URLPATH%/rhino_modules" -modules "%_URLPATH%" "%_BASEPATH%/jsdoc.js" %ARGS% --dirname="%_BASEPATH%/
 )
 
 ENDLOCAL