diff --git a/libxcrypt-4.3.3-gensalt_r_as_macro.patch b/libxcrypt-4.3.3-gensalt_r_as_macro.patch
new file mode 100644
index 0000000..bcba175
--- /dev/null
+++ b/libxcrypt-4.3.3-gensalt_r_as_macro.patch
@@ -0,0 +1,25 @@
+Index: libxcrypt-4.3.3/crypt.h.in.in
+===================================================================
+--- libxcrypt-4.3.3.orig/crypt.h.in.in
++++ libxcrypt-4.3.3/crypt.h.in.in
+@@ -178,12 +178,14 @@ extern char *crypt_gensalt_rn (const cha
+                                char *__output, int __output_size)
+ __THROW;
+ 
+-/* Identical to crypt_gensalt_rn.  Kept for code compatibility with
+-   older versions (v3.1.1 and earlier) of libxcrypt.  */
+-extern char *crypt_gensalt_r (const char *__prefix, unsigned long __count,
+-                              const char *__rbytes, int __nrbytes,
+-                              char *__output, int __output_size)
+-__THROW;
++/* Kept for code compatibility with older versions (v3.1.1 and earlier)
++   of libxcrypt.
++   We intentionally define a macro here, since we actually want to
++   link compiled applications against the identical crypt_gensalt_rn
++   function.  */
++#ifndef IN_LIBCRYPT  /* Defined when building libxcrypt. */
++# define crypt_gensalt_r crypt_gensalt_rn
++#endif
+ 
+ /* Another thread-safe version of crypt_gensalt; the generated setting
+    string is in storage allocated by malloc, and should be deallocated
diff --git a/libxcrypt.spec b/libxcrypt.spec
index 1d05c95..02fbd9d 100644
--- a/libxcrypt.spec
+++ b/libxcrypt.spec
@@ -90,7 +90,7 @@ fi                                                             \
 
 Name:           libxcrypt
 Version:        4.3.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extended crypt library for DES, MD5, Blowfish and others
 
 # For explicit license breakdown, see the
@@ -104,6 +104,7 @@ Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 # Patch 3001 - 6000: Backported patches from pull requests.
 
 # Patch 6001 - 9999: Downstream patches.
+Patch6001:      %{name}-4.3.3-gensalt_r_as_macro.patch
 
 BuildRequires:  fipscheck
 BuildRequires:  libtool
@@ -346,6 +347,10 @@ done
 
 
 %changelog
+* Tue Nov 13 2018 Björn Esser <besser82@fedoraproject.org> - 4.3.3-2
+- Add a patch to define crypt_gensalt_r as macro, so applications
+  link the identical crypt_gensalt_rn directly
+
 * Sun Nov 11 2018 Björn Esser <besser82@fedoraproject.org> - 4.3.3-1
 - New upstream release