diff --git a/build.sh b/build.sh
index 5bd8c403740c9e02af02315f7da53eeccbc4d7ce..44f1460465d9571d1ff6713196347bd51e3681ad 100644
--- a/build.sh
+++ b/build.sh
@@ -19,18 +19,8 @@ echo "deb http://download.mono-project.com/repo/ubuntu precise main" | sudo tee
 ## update
 apt-get update
 
-# Install things
-TO_INSTALL=""
-## Mono for .NET 4.0, and winbind for ntlm_auth
-TO_INSTALL="$TO_INSTALL mono-complete winbind"
-## WINE
-TO_INSTALL="$TO_INSTALL wine winetricks xvfb"
-## Fonts for Mono/WINE
-TO_INSTALL="$TO_INSTALL xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic"
-## Things
-TO_INSTALL="$TO_INSTALL unzip curl"
-## roll - globbing intended
-apt-get install -y $TO_INSTALL
+# Install WINE things
+apt-get install -y wine winetricks xvfb xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic unzip curl
 
 # Install command
 cp -f /vagrant/tibbo_build.sh /usr/sbin/tibbo_build
diff --git a/build_as_vagrant.sh b/build_as_vagrant.sh
index 4b80a26192f89418a8ec837c012a9e3649f1712e..8ae230bf167f7d032da9cabf9846d2e13173b2de 100644
--- a/build_as_vagrant.sh
+++ b/build_as_vagrant.sh
@@ -15,6 +15,9 @@ 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
+
 # Install Tibbo tools
 mkdir -p "/home/vagrant/.wine/drive_c/Program Files/Tibbo"
 wget http://dev.dms-serwis.com.pl/misc/tide-tibbo-lite-5.1.3-win32.zip -O /tmp/tibbo.zip