diff --git a/wine-tibbo/Vagrantfile b/wine-tibbo/Vagrantfile
index 0a2868e5d9332dfd16b32255cc8f24af7460843c..59b9f13480c3fa828adc199cd2a029de5824f9d8 100644
--- a/wine-tibbo/Vagrantfile
+++ b/wine-tibbo/Vagrantfile
@@ -1,6 +1,6 @@
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "skrepo/debian_stable_32bit"
+  config.vm.box = "hashicorp/precise32"
 
   config.vm.provider "virtualbox" do |v|
     v.memory = 1260
diff --git a/wine-tibbo/build.sh b/wine-tibbo/build.sh
index 0e72666f407a4e62aaacc813d015bf60ede8ea3c..8e79c887ff5602e6400974e02d2adfdef5795df9 100644
--- a/wine-tibbo/build.sh
+++ b/wine-tibbo/build.sh
@@ -4,15 +4,18 @@ export WINEPREFIX="/home/vagrant/.wine"
 export WINEARCH="win32"
 
 # Install Mono for .NET 4.0
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
 echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
-apt-get update
+sudo apt-get update
 apt-get install -y mono-complete winbind        # winbind - ntlm_auth for .NET
 
 # Install WINE
-#echo "deb http://httpredir.debian.org/debian jessie-backports main contrib non-free" >> /etc/apt/sources.list
-#apt-get update
-apt-get install -y wget xvfb wine/jessie-backports unzip wine32/jessie-backports libwine/jessie-backports wine64/jessie-backports libwine/jessie-backports fonts-wine/jessie-backports winetricks
+wget https://dl.winehq.org/wine-builds/Release.key
+sudo apt-key add Release.key
+sudo apt-add-repository https://dl.winehq.org/wine-builds/ubuntu/
+apt-get update
+apt-get install --install-recommends winehq-stable
+apt-get install -y wget xvfb wine unzip fonts-wine winetricks
 
 # Install command
 cp -f /vagrant/tibbo_build.sh /usr/sbin/tibbo_build