diff --git a/libxcrypt-4.0.0_fix_test_crypt_badsalt.patch b/libxcrypt-4.0.0_fix_test_crypt_badsalt.patch
new file mode 100644
index 0000000..f0a7c5e
--- /dev/null
+++ b/libxcrypt-4.0.0_fix_test_crypt_badsalt.patch
@@ -0,0 +1,28 @@
+From b84539c87d1522b73359772c0d6521a0f0fd5b68 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
+Date: Thu, 1 Feb 2018 14:15:04 +0100
+Subject: [PATCH] test-crypt-badsalt: Initialize cd before calling crypt_r
+
+The value of 'cd.initialized' is left uninitialized before the
+first invocation of 'crypt_r ()' in this test despite the fact
+that it should be set to zero according to the API.
+
+Ported from glibc commit: 650ba77ad547b24e0839c90ed56f7b9445d8165a
+---
+ test-crypt-badsalt.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/test-crypt-badsalt.c b/test-crypt-badsalt.c
+index 12892ba..1e1e840 100644
+--- a/test-crypt-badsalt.c
++++ b/test-crypt-badsalt.c
+@@ -68,6 +68,9 @@ main (void)
+       tests[n - 1][1] = &page[pagesize - 1];
+     }
+ 
++  /* Mark cd as initialized before first call to crypt_r.  */
++  cd.initialized = 0;
++
+   for (size_t i = 0; i < n; i++)
+     {
+       retval = crypt (tests[i][0], tests[i][1]);
diff --git a/libxcrypt.spec b/libxcrypt.spec
index d2616c8..a5753b8 100644
--- a/libxcrypt.spec
+++ b/libxcrypt.spec
@@ -19,7 +19,7 @@
 
 Name:           libxcrypt
 Version:        4.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Extended crypt library for DES, MD5, Blowfish and others
 
 # For explicit license breakdown, see the
@@ -29,6 +29,7 @@ URL:            https://github.com/besser82/%{name}
 Source0:        %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 Patch0:         %{url}/commit/db1a30dea83a74a0314fddffc35e165b1ebb3158.patch#/%{name}-4.0.0_gcc8_fix_test.patch
+Patch1:         %{url}/commit/b84539c87d1522b73359772c0d6521a0f0fd5b68.patch#/%{name}-4.0.0_fix_test_crypt_badsalt.patch
 
 BuildRequires:  fipscheck
 BuildRequires:  libtool
@@ -184,6 +185,9 @@ is highly discouraged.
 
 
 %changelog
+* Thu Feb 01 2018 Björn Esser <besser82@fedoraproject.org> - 4.0.0-3
+- Add patch to fix unintialize value in badsalt test
+
 * Wed Jan 31 2018 Björn Esser <besser82@fedoraproject.org> - 4.0.0-2
 - Add patch to fix bcrypt test with GCC8