diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat
index 19ca0dec1b8..dc709013a37 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat
@@ -9,6 +9,7 @@ IF NOT "%1"=="" SET DaemonPort=%1
 IF NOT "%2"=="" SET ServerPortRange=%2
 
 if "%1" == "?" goto usage
+if "%1" == "/?" goto usage
 if "%1" == "/h" goto usage
 if "%1" == "help" goto usage
 if "%1" == "/help" goto usage
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/server.bat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/server.bat
index e4b2b3fb07e..40327323483 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/server.bat
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/server.bat
@@ -9,13 +9,14 @@ setlocal
 set PORT=%1
 set TIMEOUT=%2
 set TICKET=%3
+if xxx%1 == xxx set PORT=4033
+if xxx%2 == xxx set TIMEOUT=120000
 
 if "%1" == "?" goto usage
+if "%1" == "/?" goto usage
 if "%1" == "/h" goto usage
 if "%1" == "help" goto usage
 if "%1" == "/help" goto usage
-if xxx%1 == xxx set PORT=4033
-if xxx%2 == xxx set TIMEOUT=120000
 
 IF NOT "%A_PLUGIN_PATH%"=="" GOTO doneSetup
 IF EXIST setup.bat GOTO HaveSetup