diff --git a/.gitignore b/.gitignore
index 21976b1235..f91449ec68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ libraries/source/spirv-reflect/*
 
 # Tools
 archives/
+build/bin/
 source/tools/spirv/rules.*.json
 
 # Files generated by running premake5
@@ -41,6 +42,7 @@ docs/doxygen/output/
 *.dylib
 *.dSYM
 *.exp
+*.exe
 *.ilk
 *.lib
 *.pdb
diff --git a/build/bin/cxxtestgen.exe b/build/bin/cxxtestgen.exe
deleted file mode 100644
index 133e44a97f..0000000000
Binary files a/build/bin/cxxtestgen.exe and /dev/null differ
diff --git a/build/bin/perl58.dll b/build/bin/perl58.dll
deleted file mode 100644
index 12ee9e490e..0000000000
Binary files a/build/bin/perl58.dll and /dev/null differ
diff --git a/build/premake/premake5/bin/release/premake5.exe b/build/premake/premake5/bin/release/premake5.exe
deleted file mode 100644
index 61dd9009d1..0000000000
Binary files a/build/premake/premake5/bin/release/premake5.exe and /dev/null differ
diff --git a/build/workspaces/update-workspaces.bat b/build/workspaces/update-workspaces.bat
index ee8cc9ee12..d679abdec2 100644
--- a/build/workspaces/update-workspaces.bat
+++ b/build/workspaces/update-workspaces.bat
@@ -1,6 +1,6 @@
 @echo off
 rem ** Create Visual Studio Workspaces on Windows **
 
-cd ..\premake
-if not exist ..\workspaces\vs2017\SKIP_PREMAKE_HERE premake5\bin\release\premake5 --outpath="../workspaces/vs2017" --build-shared-glooxwrapper %* vs2017
+cd ..\bin
+if not exist ..\workspaces\vs2017\SKIP_PREMAKE_HERE premake5.exe --file="../premake/premake5.lua" --outpath="../workspaces/vs2017" --build-shared-glooxwrapper %* vs2017
 cd ..\workspaces
diff --git a/libraries/get-windows-libs.bat b/libraries/get-windows-libs.bat
index 807d810a7e..494f42cc86 100644
--- a/libraries/get-windows-libs.bat
+++ b/libraries/get-windows-libs.bat
@@ -2,10 +2,26 @@ rem **Download sources and binaries of libraries**
 
 rem **SVN revision to checkout for windows-libs**
 rem **Update this line when you commit an update to windows-libs**
-set "svnrev=28209"
+set "svnrev=28234"
 
 svn co https://svn.wildfiregames.com/public/windows-libs/trunk@%svnrev% win32
 
-rem **Copy binaries to binaries/system/**
+rem **Copy dependencies' binaries to binaries/system/**
 
-for /d %%l in (win32\*) do (if exist %%l\bin copy /y %%l\bin\* ..\binaries\system\)
+set DIR_LIST=boost enet fcollada fmt freetype gloox iconv icu libcurl libpng libsodium libxml2 microsoft miniupnpc nvtt openal sdl2 spidermonkey vorbis wxwidgets zlib
+for %%d in (%DIR_LIST%) do (
+    if exist win32\%%d\bin\ (
+        copy /y win32\%%d\bin\* ..\binaries\system\
+    )
+)
+
+rem **Copy build tools to build/bin
+
+mkdir ..\build\bin\ 2>nul
+
+set TOOLCHAIN_DIR_LIST=premake-core cxxtest-4.4
+for %%d in (%TOOLCHAIN_DIR_LIST%) do (
+    if exist win32\%%d\bin\ (
+        copy /y win32\%%d\bin\* ..\build\bin\
+    )
+)
\ No newline at end of file