diff --git a/.cross_rubies b/.cross_rubies
index 95c02767c39..2e133030786 100644
--- a/.cross_rubies
+++ b/.cross_rubies
@@ -1,6 +1,8 @@
-2.1.6:i686-w64-mingw32
-2.1.6:x86_64-w64-mingw32
-2.2.2:i686-w64-mingw32
-2.2.2:x86_64-w64-mingw32
+2.4.0:i686-w64-mingw32
+2.4.0:x86_64-w64-mingw32
 2.3.0:i686-w64-mingw32
 2.3.0:x86_64-w64-mingw32
+2.2.2:i686-w64-mingw32
+2.2.2:x86_64-w64-mingw32
+2.1.6:i686-w64-mingw32
+2.1.6:x86_64-w64-mingw32
diff --git a/Gemfile b/Gemfile
index 8d86b4cf3d4..63bb917101e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,7 @@ gem "hoe-git", "~>1.6.0", :group => [:development, :test]
 gem "minitest", "~>5.8.4", :group => [:development, :test]
 gem "rake", "~>10.5.0", :group => [:development, :test]
 gem "rake-compiler", "~>0.9.2", :group => [:development, :test]
-gem "rake-compiler-dock", "~>0.5.1", :group => [:development, :test]
+gem "rake-compiler-dock", "~>0.6.0", :group => [:development, :test]
 gem "racc", "~>1.4.14", :group => [:development, :test], :platform => [:ruby, :mingw, :x64_mingw]
 gem "rexical", "~>1.0.5", :group => [:development, :test], :platform => [:ruby, :mingw, :x64_mingw]
 gem "hoe", "~>3.14", :group => [:development, :test]
diff --git a/Rakefile b/Rakefile
index b91a8ab3401..aa0e3118c56 100644
--- a/Rakefile
+++ b/Rakefile
@@ -137,7 +137,7 @@ HOE = Hoe.spec 'nokogiri' do
     ["minitest",           "~> 5.8.4"],
     ["rake",               "~> 10.5.0"],
     ["rake-compiler",      "~> 0.9.2"],
-    ["rake-compiler-dock", "~> 0.5.1"],
+    ["rake-compiler-dock", "~> 0.6.0"],
     ["racc",               "~> 1.4.14"],
     ["rexical",            "~> 1.0.5"]
   ]