diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4b3897b..dc7bf28e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 * Use Kernel.BigDecimal vs BigDecimal.new. Fixes #409.
 * Change `DBSETUTF16` abscence warning message. Fixes #410.
+* Add Windows binary for Ruby-2.5. Fixes #408.
 
 ## 2.1.1
 
diff --git a/tasks/native_gem.rake b/tasks/native_gem.rake
index 9810f94c..3af6f53e 100644
--- a/tasks/native_gem.rake
+++ b/tasks/native_gem.rake
@@ -8,7 +8,7 @@ task 'gem:windows' => ['ports:cross'] do
   build = ['bundle']
 
   # and finally build the native gem
-  build << 'rake cross native gem RUBY_CC_VERSION=2.4.0:2.3.0:2.2.2:2.1.6:2.0.0 CFLAGS="-Wall"'
+  build << 'rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0 CFLAGS="-Wall" MAKE="make -j`nproc`"'
 
   RakeCompilerDock.sh build.join(' && ')
 end
diff --git a/tasks/ports.rake b/tasks/ports.rake
index 38ddc03d..009f5207 100644
--- a/tasks/ports.rake
+++ b/tasks/ports.rake
@@ -76,7 +76,7 @@ namespace :ports do
 
     # build the ports for all our cross compile hosts
     GEM_PLATFORM_HOSTS.each do |gem_platform, host|
-      build << "rake ports:compile[#{host}]"
+      build << "rake ports:compile[#{host}] MAKE='make -j`nproc`'"
     end
 
     RakeCompilerDock.sh build.join(' && ')
diff --git a/tiny_tds.gemspec b/tiny_tds.gemspec
index 441041b0..593f207d 100644
--- a/tiny_tds.gemspec
+++ b/tiny_tds.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mini_portile2', '~> 2.0'
   s.add_development_dependency 'rake', '~> 10.4'
   s.add_development_dependency 'rake-compiler', '~> 1.0'
-  s.add_development_dependency 'rake-compiler-dock', '~> 0.6.0'
+  s.add_development_dependency 'rake-compiler-dock', '~> 0.6.3'
   s.add_development_dependency 'minitest', '~> 5.6'
   s.add_development_dependency 'connection_pool', '~> 2.2'
 end