diff --git a/bin/package_win32_fat_binary b/bin/package_win32_fat_binary
index b336eb7..8ef4f98 100755
--- a/bin/package_win32_fat_binary
+++ b/bin/package_win32_fat_binary
@@ -12,9 +12,8 @@ cd '/vagrant'
 # passed in path of gem to be cross-compiled
 cd $1
 
-# need to use 1.8.7 for fat-binaries (1.9.3 can't cross-build 1.8.7)
-rvm use 1.8.7
+rvm use 1.9.3
 bundle install
 
 bundle exec rake clean
-bundle exec rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.3:2.0.0
+bundle exec rake cross native gem RUBY_CC_VERSION=1.9.3:2.0.0:2.1.1
diff --git a/bin/prepare_xrubies b/bin/prepare_xrubies
index 0e2043c..bd1d3c8 100755
--- a/bin/prepare_xrubies
+++ b/bin/prepare_xrubies
@@ -18,10 +18,6 @@ rvm all do gem install rake-compiler -v "~> 0.9.2"
 # Use just one CPU for building 1.8.7 and 1.9.3
 export MAKE="make"
 
-# Build 1.8.7 with mingw32 compiler (GCC 4.2)
-rvm use 1.8.7
-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-p545 HOST=i586-mingw32msvc