diff --git a/bin/package_win32_fat_binary b/bin/package_win32_fat_binary
index 9ead80d..4ad453a 100755
--- a/bin/package_win32_fat_binary
+++ b/bin/package_win32_fat_binary
@@ -12,8 +12,8 @@ cd '/vagrant'
 # passed in path of gem to be cross-compiled
 cd $1
 
-base_version=${BASE_VERSION:-1.9.3}
-cc_versions=${RUBY_CC_VERSION:-1.8.7:1.9.3:2.0.0:2.1.4}
+base_version=${BASE_VERSION:-2.0.0}
+cc_versions=${RUBY_CC_VERSION:-1.9.3:2.0.0:2.1.6:2.2.2}
 
 # Use Ruby 1.9.3 as base to cross-compile to different versions
 rvm use $base_version
diff --git a/bin/prepare_xrubies b/bin/prepare_xrubies
index c6dd100..5b70355 100755
--- a/bin/prepare_xrubies
+++ b/bin/prepare_xrubies
@@ -12,34 +12,38 @@ fi
 # shared directory between VM and host
 cd '/vagrant'
 
-# Install rake-compiler in all Rubies
+# Install required gems in all system Rubies
 rvm all do gem install rake-compiler -v "~> 0.9.5"
+rvm all do gem install bundler -v "~> 1.9.9"
 
-# Use just one CPU for building 1.8.7 and 1.9.3
+# Use just one CPU for building 1.9.3
 export MAKE="make"
 
-# Build 1.8.7 with mingw32 compiler (GCC 4.2)
-rvm use 1.8.7-p374
-rake-compiler cross-ruby VERSION=1.8.7-p374 HOST=i586-mingw32msvc
-
 # Build 1.9.3 using 1.9.3 as base
 rvm use 1.9.3
-rake-compiler cross-ruby VERSION=1.9.3-p550 HOST=i586-mingw32msvc
+rake-compiler cross-ruby VERSION=1.9.3-p551 HOST=i586-mingw32msvc
 
 # Use all CPUs for building 2.0+
 export MAKE="make -j$(nproc)"
 
 # Build Ruby 2.0.0
-rake-compiler cross-ruby VERSION=2.0.0-p594 HOST=i686-w64-mingw32 debugflags="-g"
+rake-compiler cross-ruby VERSION=2.0.0-p645 HOST=i686-w64-mingw32 debugflags="-g"
 
 # Build x64 Ruby 2.0.0
-rake-compiler cross-ruby VERSION=2.0.0-p594 HOST=x86_64-w64-mingw32 debugflags="-g"
+rake-compiler cross-ruby VERSION=2.0.0-p645 HOST=x86_64-w64-mingw32 debugflags="-g"
 
 # Build Ruby 2.1
-rake-compiler cross-ruby VERSION=2.1.4 HOST=i686-w64-mingw32 debugflags="-g"
+rake-compiler cross-ruby VERSION=2.1.6 HOST=i686-w64-mingw32 debugflags="-g"
 
 # Build x64 Ruby 2.1
-rake-compiler cross-ruby VERSION=2.1.4 HOST=x86_64-w64-mingw32 debugflags="-g"
+rake-compiler cross-ruby VERSION=2.1.6 HOST=x86_64-w64-mingw32 debugflags="-g"
+
+# Build Ruby 2.2 using 2.0.0 as base
+rvm use 2.0.0
+rake-compiler cross-ruby VERSION=2.2.2 HOST=i686-w64-mingw32 debugflags="-g"
+
+# Build x64 Ruby 2.2
+rake-compiler cross-ruby VERSION=2.2.2 HOST=x86_64-w64-mingw32 debugflags="-g"
 
 # Mark installation prepared and don't run all this again
 touch "$HOME/.rake-compiler/.prepared"
diff --git a/bootstrap.sh b/bootstrap.sh
index bf64ec1..dc574a4 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -74,10 +74,10 @@ fi
 
 # install rubies
 $as_vagrant 'rvm install jruby'
-$as_vagrant 'rvm install 1.8.7-p374'
 $as_vagrant 'rvm install 1.9.3'
 $as_vagrant 'rvm install 2.0.0'
 $as_vagrant 'rvm install 2.1'
+$as_vagrant 'rvm install 2.2'
 
 # add /vagrant/bin to the PATH
 if ! grep -q "/vagrant/bin" $home/.bash_profile; then
diff --git a/sample_gem/Rakefile b/sample_gem/Rakefile
index 3f2913f..1d925d9 100644
--- a/sample_gem/Rakefile
+++ b/sample_gem/Rakefile
@@ -5,7 +5,6 @@ require "rake/clean"
 
 CLEAN.include(
   "tmp",
-  "lib/1.8",
   "lib/1.9",
   "lib/2.0",
   "lib/2.1",