diff --git a/extras/build-tests/windows/build.bat b/extras/build-tests/windows/build.bat
index 59bffe4b1..c2e6b701f 100644
--- a/extras/build-tests/windows/build.bat
+++ b/extras/build-tests/windows/build.bat
@@ -2,26 +2,25 @@ echo on
 
 rem Temporarily hardcoded:
 set TARGET=Visual Studio 2019
-set SHORTNAME=vs2017
+set SHORTNAME=vs2019
 
 rem Initialize Visual Studio variables
-if "%TARGET%" == "Visual Studio 2017" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
-if "%TARGET%" == "Visual Studio 2019" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"
+if "%TARGET%" == "Visual Studio 2017" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+if "%TARGET%" == "Visual Studio 2019" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
 
 rem Installing tools
 rem only for appveyor:
 rem cinst unrar -y
 rem cinst unzip -y
 rem cinst innosetup -y
-curl -fsS -o dlltool.exe https://www.unrealircd.org/files/dev/win/dlltool.exe
 
 rem Installing UnrealIRCd dependencies
 cd \projects
-mkdir unrealircd-deps
-cd unrealircd-deps
-curl -fsS -o SetACL.exe https://www.unrealircd.org/files/dev/win/SetACL.exe
-curl -fsS -o unrealircd-libraries-devel.zip https://www.unrealircd.org/files/dev/win/libs/unrealircd-libraries-devel.zip
-unzip unrealircd-libraries-devel.zip
+mkdir unrealircd-5-libs
+cd unrealircd-5-libs
+curl -fsS -o unrealircd-libraries-5-devel.zip https://www.unrealircd.org/files/dev/win/libs/unrealircd-libraries-5-devel.zip
+unzip unrealircd-libraries-5-devel.zip
+copy dlltool.exe \users\user\worker\unreal5-w10\build /y
 
 rem for appveyor: cd \projects\unrealircd
 cd \users\user\worker\unreal5-w10\build
@@ -38,9 +37,9 @@ rem And we re-run the exact same command:
 call extras\build-tests\windows\compilecmd\%SHORTNAME%.bat
 if %ERRORLEVEL% NEQ 0 EXIT /B 1
 
-rem Convert c:\dev to c:\projects\unrealircd-deps
+rem Convert c:\dev to c:\projects\unrealircd-5-libs
 rem TODO: should use environment variable in innosetup script?
-sed -i "s/c:\\dev/c:\\projects\\unrealircd-deps/gi" src\windows\unrealinst.iss
+sed -i "s/c:\\dev\\unrealircd-5-libs/c:\\projects\\unrealircd-5-libs/gi" src\windows\unrealinst.iss
 
 rem Build installer file
 "c:\Program Files (x86)\Inno Setup 5\iscc.exe" /Q- src\windows\unrealinst.iss
diff --git a/extras/build-tests/windows/compilecmd/vs2017.bat b/extras/build-tests/windows/compilecmd/vs2017.bat
deleted file mode 100644
index e7eca65ac..000000000
--- a/extras/build-tests/windows/compilecmd/vs2017.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-rem Build command for Visual Studio 2017
-
-nmake -f makefile.windows ^
-LIBRESSL_INC_DIR="c:\projects\unrealircd-deps\libressl\include" ^
-LIBRESSL_LIB_DIR="c:\projects\unrealircd-deps\libressl\lib" ^
-SSLLIB="crypto-44.lib ssl-46.lib" ^
-USE_REMOTEINC=1 ^
-LIBCURL_INC_DIR="c:\projects\unrealircd-deps\curl-ssl\include" ^
-LIBCURL_LIB_DIR="c:\projects\unrealircd-deps\curl-ssl\builds\libcurl-vc-x86-release-dll-ssl-dll-ipv6-sspi-obj-lib" ^
-CARES_LIB_DIR="c:\projects\unrealircd-deps\c-ares\msvc\cares\dll-release" ^
-CARES_INC_DIR="c:\projects\unrealircd-deps\c-ares" ^
-CARESLIB="cares.lib" ^
-PCRE2_INC_DIR="c:\projects\unrealircd-deps\pcre2\include" ^
-PCRE2_LIB_DIR="c:\projects\unrealircd-deps\pcre2\lib" ^
-PCRE2LIB="pcre2-8.lib" ^
-ARGON2_LIB_DIR="c:\projects\unrealircd-deps\argon2\vs2015\build" ^
-ARGON2_INC_DIR="c:\projects\unrealircd-deps\argon2\include" ^
-ARGON2LIB="Argon2RefDll.lib" %*
diff --git a/extras/build-tests/windows/compilecmd/vs2019.bat b/extras/build-tests/windows/compilecmd/vs2019.bat
new file mode 100644
index 000000000..f982e3a73
--- /dev/null
+++ b/extras/build-tests/windows/compilecmd/vs2019.bat
@@ -0,0 +1,18 @@
+rem Build command for Visual Studio 2019
+
+nmake -f makefile.windows ^
+LIBRESSL_INC_DIR="c:\projects\unrealircd-5-libs\libressl\include" ^
+LIBRESSL_LIB_DIR="c:\projects\unrealircd-5-libs\libressl\lib" ^
+SSLLIB="crypto-45.lib ssl-47.lib" ^
+USE_REMOTEINC=1 ^
+LIBCURL_INC_DIR="c:\projects\unrealircd-5-libs\curl-ssl\include" ^
+LIBCURL_LIB_DIR="c:\projects\unrealircd-5-libs\curl-ssl\builds\libcurl-vc-x64-release-dll-ssl-dll-cares-dll-ipv6-obj-lib" ^
+CARES_LIB_DIR="c:\projects\unrealircd-5-libs\c-ares\msvc\cares\dll-release" ^
+CARES_INC_DIR="c:\projects\unrealircd-5-libs\c-ares" ^
+CARESLIB="cares.lib" ^
+PCRE2_INC_DIR="c:\projects\unrealircd-5-libs\pcre2\include" ^
+PCRE2_LIB_DIR="c:\projects\unrealircd-5-libs\pcre2\lib" ^
+PCRE2LIB="pcre2-8.lib" ^
+ARGON2_LIB_DIR="c:\projects\unrealircd-5-libs\argon2\vs2015\build" ^
+ARGON2_INC_DIR="c:\projects\unrealircd-5-libs\argon2\include" ^
+ARGON2LIB="Argon2RefDll.lib" %*