diff --git a/libxcrypt-4.4.16-Fix_Wformat-overflow.patch b/libxcrypt-4.4.16-Fix_Wformat-overflow.patch
new file mode 100644
index 0000000..e991b02
--- /dev/null
+++ b/libxcrypt-4.4.16-Fix_Wformat-overflow.patch
@@ -0,0 +1,23 @@
+From b205c653ba7b5efe685532daaf9db6c4cbd9aa26 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
+Date: Sat, 15 Aug 2020 11:45:33 +0200
+Subject: [PATCH] test/alg-yescrypt: Fix '-Wformat-overflow' with GCC 10.2 on
+ s390x.
+
+---
+ test/alg-yescrypt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/alg-yescrypt.c b/test/alg-yescrypt.c
+index 0694079..62b4f9e 100644
+--- a/test/alg-yescrypt.c
++++ b/test/alg-yescrypt.c
+@@ -250,7 +250,7 @@ int main(void)
+ 			    {flags, (uint64_t)1 << N_log2, r, p, 0, 0, 0};
+ 			setting = yescrypt_encode_params(&params,
+ 			    (const uint8_t *)"WZaPV7LSUEKMo34.", 16 - (i & 15));
+-			if (i == 0)
++			if (setting && i == 0)
+ 				printf("'%s'\n", (char *)setting);
+ 			if (!setting) {
+ 				printf("%d yescrypt_encode_params() = NULL\n", i);
diff --git a/libxcrypt.spec b/libxcrypt.spec
index c75c3f4..7ad9bc4 100644
--- a/libxcrypt.spec
+++ b/libxcrypt.spec
@@ -163,6 +163,7 @@ URL:            https://github.com/besser82/%{name}
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
 # Patch 0000 - 2999: Backported patches from upstream.
+Patch0000:      https://github.com/besser82/libxcrypt/commit/b205c653ba7b5efe685532daaf9db6c4cbd9aa26.patch#/libxcrypt-4.4.16-Fix_Wformat-overflow.patch
 
 # Patch 3000 - 5999: Backported patches from pull requests.
 Patch3000:      libxcrypt-4.4.16-enable_LTO_build.patch
@@ -486,6 +487,7 @@ done
 * Sat Aug 15 2020 Björn Esser <besser82@fedoraproject.org> - 4.4.16-7
 - Add a patch to add support for LTO builds
 - Enable LTO
+- Add a patch to fix Wformat-overflow
 
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.16-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild