diff --git a/build.sh b/build.sh
index 44f1460465d9571d1ff6713196347bd51e3681ad..7550b74582bc138549c04ecf956b219bcd1fd651 100644
--- a/build.sh
+++ b/build.sh
@@ -12,11 +12,6 @@ apt-get install -y python-software-properties
 ## Mono
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
 echo "deb http://download.mono-project.com/repo/ubuntu precise main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
-## WineHQ
-# wget https://dl.winehq.org/wine-builds/Release.key
-# apt-key add Release.key
-# apt-add-repository https://dl.winehq.org/wine-builds/ubuntu/
-## update
 apt-get update
 
 # Install WINE things
diff --git a/build_as_vagrant.sh b/build_as_vagrant.sh
index 8ae230bf167f7d032da9cabf9846d2e13173b2de..b43ad14f3edd9f557d9482ca11cdea7c9659b885 100644
--- a/build_as_vagrant.sh
+++ b/build_as_vagrant.sh
@@ -4,6 +4,7 @@ set -x
 
 export DISPLAY=:0.0
 export WINEPREFIX="/home/vagrant/.wine"
+export WINEARCH="win32"
 
 cd /home/vagrant
 
@@ -15,8 +16,8 @@ export DISPLAY=:0.0
 wine start.exe
 ln -s /vagrant /home/vagrant/.wine/drive_c/vagrant
 
-# Only now is it safe to install Mono
-sudo apt-get install winbind mono-complete
+# Only now is it safe to install Mono :/ it requires wine for setup
+sudo apt-get install -y winbind mono-complete
 
 # Install Tibbo tools
 mkdir -p "/home/vagrant/.wine/drive_c/Program Files/Tibbo"