diff --git a/autoninja.bat b/autoninja.bat
index dd9f12eb9..cfe662548 100755
--- a/autoninja.bat
+++ b/autoninja.bat
@@ -7,6 +7,12 @@ setlocal
 
 set scriptdir=%~dp0
 
+if "%*" == "/?" (
+  rem Handle "autoninja /?" which will otherwise give help on the "call" command
+  @call python3.bat %~dp0\ninja.py --help
+  exit /b
+)
+
 if not defined AUTONINJA_BUILD_ID (
   :: Set unique build ID.
   FOR /f "usebackq tokens=*" %%a in (`%scriptdir%python-bin\python3.bat -c "import uuid; print(uuid.uuid4())"`) do set AUTONINJA_BUILD_ID=%%a
diff --git a/goma_ctl.bat b/goma_ctl.bat
index eb2658080..d8bd49266 100644
--- a/goma_ctl.bat
+++ b/goma_ctl.bat
@@ -8,5 +8,9 @@
 set scriptdir=%~dp0
 
 @call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
+if "%*" == "/?" (
+  @call %scriptdir%python-bin\python3.bat %~dp0\.cipd_bin\goma_ctl.py --help
+  exit /b
+)
 @call %scriptdir%python-bin\python3.bat %~dp0\.cipd_bin\goma_ctl.py %*
 exit /b %ERRORLEVEL%