diff --git a/Documentation/CMakeLists.txt b/Documentation/CMakeLists.txt
index 1868ef853fd..799a9c5c39e 100644
--- a/Documentation/CMakeLists.txt
+++ b/Documentation/CMakeLists.txt
@@ -115,6 +115,7 @@ if(DOXYGEN_FOUND)
   # directory.
   if(WIN32)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pkglist_filter.bat ${CMAKE_BINARY_DIR}/pkglist_filter)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pkglist_filter.bat ${CMAKE_BINARY_DIR}/pkglist_filter.bat)
   else()
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pkglist_filter ${CMAKE_BINARY_DIR}/pkglist_filter)
   endif()
diff --git a/Documentation/pkglist_filter.bat b/Documentation/pkglist_filter.bat
index 1cc512ae7c2..4d8cccb9524 100644
--- a/Documentation/pkglist_filter.bat
+++ b/Documentation/pkglist_filter.bat
@@ -1,18 +1,18 @@
 @echo off
 
-@where python
+@where /q python
 if not errorlevel 1 ( set python=python )
 
-@where python2
+@where /q python2
 if not errorlevel 1 ( set python=python2 )
 
-@where python2.6
+@where /q python2.6
 if not errorlevel 1 ( set python=python2.6 )
 
-@where python2.7
+@where /q python2.7
 if not errorlevel 1 ( set python=python2.7 )
 
-@echo on
-
 :go
 %python% ${CMAKE_BINARY_DIR}/pkglist_filter.py %1
+
+@echo on