diff --git a/docs/win32_build_scripts/pokerth_download_libs.cmd b/docs/win32_build_scripts/pokerth_download_libs.cmd
index e1d833b9..552cfe65 100644
--- a/docs/win32_build_scripts/pokerth_download_libs.cmd
+++ b/docs/win32_build_scripts/pokerth_download_libs.cmd
@@ -51,16 +51,16 @@ echo The process will start if you press any other key.
 pause
 echo.
 echo Downloading mingw packages
-%PKTH_OldDir%\third_party_apps\curl -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/tdm-gcc/gcc-4.3.3-tdm-1-core.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/tdm-gcc/gcc-4.3.3-tdm-1-g++.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/binutils-2.19.1-mingw32-bin.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingwrt-3.15.2-mingw32-dev.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingwrt-3.15.2-mingw32-dll.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/w32api-3.11.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingw32-make-3.81-20080326-3.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingw-utils-0.3.tar.gz
+%PKTH_OldDir%\third_party_apps\curl -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/tdm-gcc/gcc-4.3.3-tdm-1-dw2-core.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/tdm-gcc/gcc-4.3.3-tdm-1-dw2-g++.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/binutils-2.19.1-mingw32-bin.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingwrt-3.15.2-mingw32-dev.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingwrt-3.15.2-mingw32-dll.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/w32api-3.11.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingw32-make-3.81-20080326-3.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingw-utils-0.3.tar.gz
 if not errorlevel 0 goto downloadFailed
 echo.
 echo Unpacking mingw packages
 mkdir mingw
-%PKTH_OldDir%\third_party_apps\7za x -y gcc-4.3.3-tdm-1-core.tar.gz
-%PKTH_OldDir%\third_party_apps\7za x -y -omingw gcc-4.3.3-tdm-1-core.tar
+%PKTH_OldDir%\third_party_apps\7za x -y gcc-4.3.3-tdm-1-dw2-core.tar.gz
+%PKTH_OldDir%\third_party_apps\7za x -y -omingw gcc-4.3.3-tdm-1-dw2-core.tar
 del gcc-4.3.3-tdm-1-core.tar
-%PKTH_OldDir%\third_party_apps\7za x -y gcc-4.3.3-tdm-1-g++.tar.gz
-%PKTH_OldDir%\third_party_apps\7za x -y -omingw gcc-4.3.3-tdm-1-g++.tar
+%PKTH_OldDir%\third_party_apps\7za x -y gcc-4.3.3-tdm-1-dw2-g++.tar.gz
+%PKTH_OldDir%\third_party_apps\7za x -y -omingw gcc-4.3.3-tdm-1-dw2-g++.tar
 del gcc-4.3.3-tdm-1-g++.tar
 %PKTH_OldDir%\third_party_apps\7za x -y binutils-2.19.1-mingw32-bin.tar.gz
 %PKTH_OldDir%\third_party_apps\7za x -y -omingw binutils-2.19.1-mingw32-bin.tar
@@ -81,6 +81,20 @@ del mingw32-make-3.81-20080326-3.tar
 %PKTH_OldDir%\third_party_apps\7za x -y -omingw mingw-utils-0.3.tar
 del mingw-utils-0.3.tar
 echo.
+echo Renaming compiler files (remove dw2-postfix).
+cd /d %PKTH_BaseDir%
+cd mingw\bin
+ren c++-dw2.exe c++.exe
+ren cpp-dw2.exe cpp.exe
+ren g++-dw2.exe g++.exe
+ren gcc-dw2.exe gcc.exe
+ren gcov-dw2.exe gcov.exe
+ren mingw32-c++-dw2.exe mingw32-c++.exe
+ren mingw32-g++-dw2.exe mingw32-g++.exe
+ren mingw32-gcc-4.3.3-dw2.exe mingw32-gcc-4.3.3.exe
+ren mingw32-gcc-dw2.exe mingw32-gcc.exe
+cd /d %PKTH_BaseDir%
+echo.
 echo Testing g++
 set PATH=%PKTH_BaseDir%\mingw\bin;%PATH%
 g++ %PKTH_OldDir%\helper_src\pkth_test.cpp -o pkth_test