diff --git a/Doc/make.bat b/Doc/make.bat
index a26851fb787..504e4b58e47 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -1,8 +1,9 @@
-@echo off
+@@echo off
 setlocal
 
 set SVNROOT=http://svn.python.org/projects
-if "%PYTHON%" EQU "" set PYTHON=python25
+if "%PYTHON%" EQU "" set PYTHON=..\pcbuild\python
+if "%HTMLHELP%" EQU "" set HTMLHELP=%ProgramFiles%\HTML Help Workshop\hhc.exe
 
 if "%1" EQU "" goto help
 if "%1" EQU "html" goto build
@@ -41,7 +42,7 @@ if not exist build mkdir build
 if not exist build\%1 mkdir build\%1
 if not exist build\doctrees mkdir build\doctrees
 cmd /C %PYTHON% tools\sphinx-build.py -b%1 -dbuild\doctrees . build\%1
-if "%1" EQU "htmlhelp" "%ProgramFiles%\HTML Help Workshop\hhc.exe" build\htmlhelp\pydoc.hhp
+if "%1" EQU "htmlhelp" "%HTMLHELP%" build\htmlhelp\pydoc.hhp
 goto end
 
 :webrun