diff --git a/docs/doxygen/regen.bat b/docs/doxygen/regen.bat
index 56d26da04d..d52d7e7631 100644
--- a/docs/doxygen/regen.bat
+++ b/docs/doxygen/regen.bat
@@ -1,26 +1,34 @@
+@echo off
 REM $Id$
 
 REM This bash script regenerates the HTML doxygen version of the
 REM wxWidgets manual and adjusts the doxygen log to make it more
 REM readable.
 
-mkdir out
-mkdir out\html
-mkdir out\html\wxgtk
-mkdir out\html\wxmsw
-mkdir out\html\wxmac
+mkdir out 2>&1 >NUL
+mkdir out\html 2>&1 >NUL
+mkdir out\html\wxgtk 2>&1 >NUL
+mkdir out\html\wxmsw 2>&1 >NUL
+mkdir out\html\wxmac 2>&1 >NUL
 
 REM this image is not automatically copied by Doxygen because it's not
 REM used in doxygen documentation but only in our html footer...
-copy images\powered-by-wxwidgets.png out\html
-copy images\*logo.png out\html
-copy images\wxgtk\*png out\html\wxgtk
-copy images\wxmsw\*png out\html\wxmsw
-copy images\wxmac\*png out\html\wxmac
+copy images\powered-by-wxwidgets.png out\html 2>&1 >NUL
+copy images\*logo.png out\html 2>&1 >NUL
+copy images\wxgtk\*png out\html\wxgtk 2>&1 >NUL
+copy images\wxmsw\*png out\html\wxmsw 2>&1 >NUL
+copy images\wxmac\*png out\html\wxmac 2>&1 >NUL
 
 REM this CSS is automatically copied by Doxygen because it's
 REM included by our custom html header...
-copy wxwidgets.css out\html
+copy wxwidgets.css out\html 2>&1 >NUL
+
+REM set cfgfile variable to the right doxyfile to use,
+REM using MS broken batch scripting
+setlocal enableextensions
+set arg=%1
+if "%arg%" EQU "" set cfgfile=Doxyfile_all
+if "%arg%" NEQ "" set cfgfile=Doxyfile_%1
 
 REM
 REM NOW RUN DOXYGEN
@@ -29,4 +37,5 @@ REM NB: we do this _after_ copying the required files to the output folders
 REM     otherwise when generating the CHM file with Doxygen, those files are
 REM     not included!
 REM
-doxygen Doxyfile_all
+set PATH=%PATH%;%HHC_PATH%
+doxygen %cfgfile%