diff --git a/scripts/cmake/ExternalProjectBoost.cmake b/scripts/cmake/ExternalProjectBoost.cmake
index df70f9d1e473ffb9f308014090e6ba338c44d6e6..a381734682f3ce49b1b11aea94637d825dd045cc 100644
--- a/scripts/cmake/ExternalProjectBoost.cmake
+++ b/scripts/cmake/ExternalProjectBoost.cmake
@@ -29,7 +29,9 @@ SET(BOOST_LIBS_TO_BUILD
 # First check for system boost
 IF(NOT Boost_INCLUDE_DIRS)
 	SET(Boost_USE_STATIC_LIBS ON)
-	SET(Boost_USE_STATIC_RUNTIME OFF)
+	IF(OGS_LIBS_DIR)
+		SET(BOOST_ROOT ${OGS_LIBS_DIR/boost})
+	ENDIF()
 	FIND_PACKAGE(Boost 1.48.0 COMPONENTS ${BOOST_LIBS_TO_BUILD})
 	IF(Boost_FOUND)
 		INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index cc583ed05dbfadc2f06707b8ff71e5c377d15678..906d048f67e427deddfa3a13210345d4be79ad8a 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -7,7 +7,7 @@ FIND_PATH(OGS_LIBS_DIR_FOUND geotiff.lib
 	PATHS $ENV{OGS_LIBS} ${OGS_LIBS_DIR} ${PROJECT_SOURCE_DIR}/../libs C:/OGS_Libs
 	PATH_SUFFIXES libgeotiff)
 IF(OGS_LIBS_DIR_FOUND)
-	SET(OGS_LIBS_DIR ${OGS_LIBS_DIR_FOUND}/..)
+	SET(OGS_LIBS_DIR ${OGS_LIBS_DIR_FOUND}/.. CACHE STRING "")
 ENDIF()
 
 ######################
diff --git a/scripts/setup/setup_libraries.sh b/scripts/setup/setup_libraries.sh
index 1c545139d6c5f477ce75823ba5a54ff73560c766..759a103e688a42d336eba01ddba13d4141acd1d2 100755
--- a/scripts/setup/setup_libraries.sh
+++ b/scripts/setup/setup_libraries.sh
@@ -15,6 +15,8 @@ SHAPELIB_VERSION="shapelib-1.3.0"
 LIBGEOTIFF_VERSION="libgeotiff-1.3.0"
 INSTANTCLIENT_VERSION="instantclient_11_2"
 METIS_VERSION="metis-5.0.2"
+BOOST_VERSION="1.53.0"
+BOOST_VERSION_UNDERSCORE=${BOOST_VERSION/./_}
 
 ## Windows specific
 if [ "$OSTYPE" == 'msys' ]; then
@@ -61,7 +63,7 @@ if [ "$OSTYPE" == 'msys' ]; then
 			exit\
 			" > build.bat
 
-			$COMSPEC \/k build.bat
+			$COMSPEC //k build.bat
 			QT_WAS_BUILT=true
 		fi
 
@@ -129,7 +131,7 @@ if [ "$OSTYPE" == 'msys' ]; then
 		exit\
 		" > build.bat
 
-		$COMSPEC \/k build.bat
+		$COMSPEC //k build.bat
 	fi
 
 	# Install libgeotiff
@@ -161,7 +163,7 @@ if [ "$OSTYPE" == 'msys' ]; then
 		exit\
 		" > build.bat
 
-		$COMSPEC \/k build.bat
+		$COMSPEC //k build.bat
 	fi
 
 	# Install Metis
@@ -182,13 +184,34 @@ if [ "$OSTYPE" == 'msys' ]; then
 	else
 		# Compile
 		cd metis
-		$COMSPEC \/c "vsgen.bat -G \"$CMAKE_GENERATOR\""
+		$COMSPEC //c "vsgen.bat -G \"$CMAKE_GENERATOR\""
 		cd build/windows
 		cmake --build . --config Release
 		cd ../..
 		cp build/windows/libmetis/Release/metis.lib ../lib/metis.lib
 		cp include/metis.h ../include/metis.h
 	fi
+
+	# Install Boost
+	cd $LIBS_LOCATION
+	if [ ! -d boost ]; then
+		# Download, extract, rename
+		download_file http://sourceforge.net/projects/boost/files/boost/$BOOST_VERSION/boost_$BOOST_VERSION_UNDERSCORE.zip/download ./boost_$BOOST_VERSION_UNDERSCORE.zip
+		7za x boost_$BOOST_VERSION_UNDERSCORE.zip
+		mv boost_$BOOST_VERSION_UNDERSCORE/ boost/
+		rm boost_$BOOST_VERSION_UNDERSCORE.zip
+	elif [ -f boost/xyz ]; then
+		BOOST_FOUND=true
+	fi
+
+	if [ $BOOST_FOUND ]; then
+		echo "Boost is already installed in ..."
+	else
+		# Compile
+		cd boost
+		$COMSPEC //c bootstrap.bat
+		$COMSPEC //c bjam.exe
+	fi
 fi
 
 cd $SOURCE_LOCATION/scripts/setup
\ No newline at end of file