diff --git a/scripts/README b/scripts/README
index 13be345..d3bb6d7 100644
--- a/scripts/README
+++ b/scripts/README
@@ -17,7 +17,7 @@ revert                                                          YES
 source.SVN update for trunk/reactos        YES                  YES
 source.SVN update for trunk/rostests     OPTIONAL               YES
 patching                                                        YES
-configure                                  YES                  YES
+configure (or configure_msvc)              YES                  YES
 build_host_tools                           YES                  YES
 build_reactos bootcd                     OPTIONAL
 build_reactos livecd                     OPTIONAL
diff --git a/scripts/configure b/scripts/configure
index 1f70faf..88eb93c 100755
--- a/scripts/configure
+++ b/scripts/configure
@@ -1,5 +1,5 @@
 #!/bin/bash
-# ReactOS BuildBot Build Scripts for Linux
+# ReactOS BuildBot Build Scripts
 # configure - Set up the environment for building and let CMake generate build files.
 source ../../config.inc
 
@@ -13,9 +13,9 @@ $TIME bash -c "(
 
 	cd host-tools
 	rm -f CMakeCache.txt
-	cmake -G 'Ninja' -DARCH=$ROS_ARCH $SOURCEDIR
+	cmake -G 'Ninja' -DARCH:STRING=$ROS_ARCH $SOURCEDIR
 
 	cd ../reactos
 	rm -f CMakeCache.txt
-	cmake -G 'Ninja' -DENABLE_CCACHE=1 -DPCH=0 -DUSE_PSEH3=1 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ROS_ARCH -DREACTOS_BUILD_TOOLS_DIR=$ROS_OUTPUT/host-tools $SOURCEDIR
+	cmake -G 'Ninja' -DENABLE_CCACHE:BOOL=1 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ROS_ARCH -DREACTOS_BUILD_TOOLS_DIR:PATH=$ROS_OUTPUT/host-tools $SOURCEDIR
 )"
diff --git a/scripts/configure_msvc b/scripts/configure_msvc
new file mode 100755
index 0000000..46a5ed4
--- /dev/null
+++ b/scripts/configure_msvc
@@ -0,0 +1,30 @@
+#!/bin/bash
+# ReactOS BuildBot Build Scripts
+# configure - Set up the environment for building and let CMake generate build files.
+source ../../config.inc
+
+#
+# Default configuration in config.inc is RosBE/GCC-related
+# MSVC configuration requires overwrites in builder_config.inc like this:
+#
+#export INCLUDE="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um"
+#export LIB="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\LIB;C:\Program Files (x86)\Windows Kits\8.1\lib\winv6.3\um\x86"
+#export LIBPATH="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\LIB"
+#export PATH="/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 12.0/VC/BIN:/cygdrive/c/Program Files (x86)/Windows Kits/8.1/bin/x86:$ROSBE_DIR/bin:/usr/bin:/cygdrive/c/Windows/System32/wbem:/cygdrive/c/Windows/System32"
+#export ROS_OUTPUT="$WORKDIR/output-VS-$ROS_ARCH"
+#
+
+$TIME bash -c "(
+	mkdir -p $ROS_OUTPUT
+	cd $ROS_OUTPUT
+	mkdir -p host-tools
+	mkdir -p reactos
+	
+	cd host-tools
+	rm -f CMakeCache.txt
+	cmake -G 'Ninja' -DARCH:STRING=$ROS_ARCH $SOURCEDIR
+
+	cd ../reactos
+	rm -f CMakeCache.txt
+	cmake -G 'Ninja' -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=$ROS_ARCH -DREACTOS_BUILD_TOOLS_DIR:PATH="$ROS_OUTPUT/host-tools" -DRUNTIME_CHECKS:BOOL=1 $SOURCEDIR
+)"