diff --git a/deploy/Vagrantfile b/deploy/Vagrantfile
index 31d1641f..d69fcc63 100644
--- a/deploy/Vagrantfile
+++ b/deploy/Vagrantfile
@@ -9,11 +9,23 @@ end
 
 Vagrant::Config.run do |config|
   config.vm.define :i686 do |c|
+    c.vm.box_url = "https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-centos-5.8-i386.box"
+    c.vm.box     = "centos_58_32bit"
+    c.vm.customize ["modifyvm", :id, "--ostype", "RedHat"]
+  end
+
+  config.vm.define :x86_64 do |c|
+    c.vm.box_url = "https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-centos-5.8.box"
+    c.vm.box     = "centos_58_64bit"
+    c.vm.customize ["modifyvm", :id, "--ostype", "RedHat_64"]
+  end
+
+  config.vm.define :lucid32 do |c|
     c.vm.box_url = "http://files.vagrantup.com/lucid32.box"
     c.vm.box     = "lucid32"
   end
 
-  config.vm.define :x86_64 do |c|
+  config.vm.define :lucid64 do |c|
     c.vm.box_url = "http://files.vagrantup.com/lucid64.box"
     c.vm.box     = "lucid64"
   end
diff --git a/deploy/provision-vm.sh b/deploy/provision-vm.sh
index 6831a9cb..1ab3c456 100755
--- a/deploy/provision-vm.sh
+++ b/deploy/provision-vm.sh
@@ -1,7 +1,28 @@
 #!/usr/bin/env bash
 
-apt-get update
-apt-get install -y build-essential git-core libssl-dev libfontconfig1-dev gdb binutils-gold upx-ucl
+export PATH=$HOME/git/bin:$PATH
+
+if type apt-get >/dev/null 2>&1; then
+    apt-get update
+    apt-get install -y build-essential git-core libssl-dev libfontconfig1-dev gdb binutils-gold
+fi
+
+if type yum >/dev/null 2>&1; then
+    yum -y update
+    yum -y install gcc gcc-c++ make openssl-devel freetype-devel fontconfig-devel
+    if type git >/dev/null 2>&1; then
+        echo "Git is already available."
+    else
+        yum -y install cpio expat-devel gettext-devel zlib-devel
+        echo "Downloading and building git..."
+        rm -rf git-*
+        wget -nv https://git-core.googlecode.com/files/git-1.8.0.3.tar.gz
+        tar -xzvf git-1.8.0.3.tar.gz
+        cd git-1.8.0.3
+        ./configure --prefix=$HOME/git && make -j2 && make install
+        sleep 3
+    fi
+fi
 
 if [[ ! -d phantomjs ]]; then
     git clone git://github.com/ariya/phantomjs.git