diff --git a/scripts/base/architecture_option_win.sh b/scripts/base/architecture_option_win.sh
index fcbe46c77d2546c7237d648f585f939aa2919b6b..79cf6f902b20bc51bd32e1eeed7c304e9369b3e7 100644
--- a/scripts/base/architecture_option_win.sh
+++ b/scripts/base/architecture_option_win.sh
@@ -1,9 +1,11 @@
 if [ "$OPTARG" == "x32" ]; then
 	ARCHITECTURE="x32"
 	WIN_ARCHITECTURE="x86"
+	BITS="32"
 elif [ "$OPTARG" == "x64" ]; then
 	ARCHITECTURE="x64"
 	WIN_ARCHITECTURE="x64"
+	BITS="64"
 else
 	echo "$OPTARG is not a valid argument. Specify x32 or x64."
 	exit 1
diff --git a/scripts/setup/setup_libraries.sh b/scripts/setup/setup_libraries.sh
index 5cbc6f49a651f2021a913f742e0c4aadb4e77ebc..667e9172803d33207eecb2b631b49e2dd8b11e9e 100755
--- a/scripts/setup/setup_libraries.sh
+++ b/scripts/setup/setup_libraries.sh
@@ -212,7 +212,7 @@ if [ "$OSTYPE" == 'msys' ]; then
 		echo " \
 			\"$WIN_DEVENV_PATH\\..\\..\\VC\\vcvarsall.bat\" $WIN_ARCHITECTURE &&\
 			bootstrap.bat &&\
-			bjam.exe &&\
+			bjam.exe address-model=$BITS &&\
 			exit\
 			" > build.bat
 		$COMSPEC //k build.bat