diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffe8e6b7..a44bf42a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 * Reduce number of files shipped with precompiled Windows gem
 * Provide precompiled gem for Linux (GNU + MUSL / 64-bit x86 + ARM)
 * Fix wrappers for `tsql` and `defncopy` utility.
+* Use libiconv v1.18 and freetds v1.4.26 for Windows and Linux builds
 
 ## 3.1.0
 
diff --git a/ext/tiny_tds/extconsts.rb b/ext/tiny_tds/extconsts.rb
index 6151aaf5..fa34363d 100644
--- a/ext/tiny_tds/extconsts.rb
+++ b/ext/tiny_tds/extconsts.rb
@@ -1,8 +1,8 @@
-ICONV_VERSION = ENV["TINYTDS_ICONV_VERSION"] || "1.17"
+ICONV_VERSION = ENV["TINYTDS_ICONV_VERSION"] || "1.18"
 ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
 
 OPENSSL_VERSION = ENV["TINYTDS_OPENSSL_VERSION"] || "3.4.0"
 OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
 
-FREETDS_VERSION = ENV["TINYTDS_FREETDS_VERSION"] || "1.4.23"
+FREETDS_VERSION = ENV["TINYTDS_FREETDS_VERSION"] || "1.4.26"
 FREETDS_SOURCE_URI = "http://www.freetds.org/files/stable/freetds-#{FREETDS_VERSION}.tar.bz2"
diff --git a/tasks/native_gem.rake b/tasks/native_gem.rake
index 2d7d0f00..f35cb661 100644
--- a/tasks/native_gem.rake
+++ b/tasks/native_gem.rake
@@ -7,7 +7,7 @@ CrossLibraries.each do |xlib|
 
     RakeCompilerDock.sh <<-EOT, platform: platform
 			bundle install &&
-			rake native:#{platform} pkg/#{SPEC.full_name}-#{platform}.gem MAKEOPTS=-j`nproc` RUBY_CC_VERSION=3.4.1:3.3.5:3.2.0:3.1.0:3.0.0:2.7.0 MAKEFLAGS="V=1"
+			rake native:#{platform} pkg/#{SPEC.full_name}-#{platform}.gem MAKEOPTS=-j`nproc` RUBY_CC_VERSION=#{RakeCompilerDock.set_ruby_cc_version("~> 2.7", "~> 3.0")} MAKEFLAGS="V=1"
     EOT
   end
 
diff --git a/tiny_tds.gemspec b/tiny_tds.gemspec
index 8b427e99..6f05d80e 100644
--- a/tiny_tds.gemspec
+++ b/tiny_tds.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "mini_portile2", "~> 2.8.0"
   s.add_development_dependency "rake", "~> 13.0.0"
   s.add_development_dependency "rake-compiler", "~> 1.2"
-  s.add_development_dependency "rake-compiler-dock", "~> 1.7.0"
+  s.add_development_dependency "rake-compiler-dock", "~> 1.9.1"
   s.add_development_dependency "minitest", "~> 5.25"
   s.add_development_dependency "minitest-reporters", "~> 1.6.1"
   s.add_development_dependency "connection_pool", "~> 2.2.0"