diff --git a/History.md b/History.md
index eaf735b8..7467b310 100644
--- a/History.md
+++ b/History.md
@@ -2,6 +2,7 @@
 
 - Fix host list duplication every time conn.reset is used. [#586](https://github.com/ged/ruby-pg/pull/586)
 - Add default decoder for anonymous record types to BasicTypeRegistry [#579](https://github.com/ged/ruby-pg/pull/579)
+- Update Windows fat binary gem to OpenSSL-3.3.2 and PostgreSQL-16.4.
 
 
 ## v1.5.7 [2024-07-28] Lars Kanis <lars@greiz-reinsdorf.de>
@@ -14,6 +15,7 @@
 - Add missing PG::RollbackTransaction as an option to exit conn.transaction. [#560](https://github.com/ged/ruby-pg/pull/560)
   Usage like in rails: https://api.rubyonrails.org/classes/ActiveRecord/Rollback.html
 - Don't print a warning when bigdecimal is required on ruby-3.4+ [#574](https://github.com/ged/ruby-pg/pull/574)
+- Update Windows fat binary gem to OpenSSL-3.3.1 and PostgreSQL-16.3.
 
 
 ## v1.5.6 [2024-03-01] Lars Kanis <lars@greiz-reinsdorf.de>
diff --git a/Rakefile.cross b/Rakefile.cross
index 9b1d671f..6e2e2acb 100644
--- a/Rakefile.cross
+++ b/Rakefile.cross
@@ -31,8 +31,8 @@ class CrossLibrary < OpenStruct
 		self.host_platform              = toolchain
 
 		# Cross-compilation constants
-		self.openssl_version            = ENV['OPENSSL_VERSION'] || '3.3.1'
-		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '16.3'
+		self.openssl_version            = ENV['OPENSSL_VERSION'] || '3.3.2'
+		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '16.4'
 
 		# Check if symlinks work in the current working directory.
 		# This fails, if rake-compiler-dock is running on a Windows box.
@@ -52,9 +52,8 @@ class CrossLibrary < OpenStruct
 
 		# Static OpenSSL build vars
 		self.static_openssl_builddir    = static_builddir + "openssl-#{openssl_version}"
-
 		self.openssl_source_uri         =
-			URI( "http://www.openssl.org/source/openssl-#{openssl_version}.tar.gz" )
+			URI( "https://github.com/openssl/openssl/releases/download/openssl-#{openssl_version}/openssl-#{openssl_version}.tar.gz" )
 		self.openssl_tarball            = static_sourcesdir + File.basename( openssl_source_uri.path )
 		self.openssl_makefile           = static_openssl_builddir + 'Makefile'