diff --git a/openldap.spec b/openldap.spec
index 3d01de5..49d14b7 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -3,9 +3,11 @@
 %global systemctl_bin /usr/bin/systemctl
 %global check_password_version 1.1
 
+%global so_ver 2
+
 Name: openldap
 Version: 2.4.56
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: LDAP support libraries
 License: OpenLDAP
 URL: http://www.openldap.org/
@@ -63,6 +65,17 @@ protocols for enabling directory services over the Internet. Install
 this package only if you plan to develop or will need to compile
 customized LDAP clients.
 
+%package compat
+Summary: Package providing legacy non-threded libldap
+Requires: openldap%{?_isa} = %{version}-%{release}
+# since libldap is manually linked from libldap_r, the provides is not generated automatically
+Provides: libldap-2.4.so.%{so_ver}()(%{__isa_bits}bit)
+
+%description compat
+The openldap-compat package contains non-threaded variant of libldap
+which should not be used. Instead, applications should link to libldap_r
+which provides thread-safe variant with the very same API.
+
 %package servers
 Summary: LDAP server
 License: OpenLDAP
@@ -263,8 +276,14 @@ v=%{version}
 version=$(echo ${v%.[0-9]*})
 for lib in liblber libldap libldap_r libslapi; do
 	rm -f ${lib}.so
-	ln -s ${lib}-${version}.so.2 ${lib}.so
+	ln -s ${lib}-${version}.so.%{so_ver} ${lib}.so
 done
+
+# provide only libldap_r and symlink libldap to it
+rm -f libldap.so
+ln -s libldap{_r,}.so
+rm -f libldap-*.so.*
+ln -s libldap{_r,}-${version}.so.%{so_ver}
 popd
 
 # tweak permissions on the libraries to make sure they're correct
@@ -403,7 +422,6 @@ exit 0
 %config(noreplace) %{_sysconfdir}/openldap/ldap.conf
 %dir %{_libexecdir}/openldap/
 %{_libdir}/liblber-2.4*.so.*
-%{_libdir}/libldap-2.4*.so.*
 %{_libdir}/libldap_r-2.4*.so.*
 %{_libdir}/libslapi-2.4*.so.*
 %{_mandir}/man5/ldif.5*
@@ -478,14 +496,21 @@ exit 0
 %{_includedir}/*
 %{_mandir}/man3/*
 
+
+%files compat
+%{_libdir}/libldap-2.4*.so.*
+
 %changelog
+* Wed Nov 18 2020 Simon Pichugin <spichugi@redhat.com> - 2.4.56-2
+- Drop non-threaded libldap (#1537260)
+
 * Wed Nov 18 2020 Simon Pichugin <spichugi@redhat.com> - 2.4.56-1
 - Rebase to version 2.4.56 (#1896508)
 
-* Thu Nov 02 2020 Simon Pichugin <spichugi@redhat.com> - 2.4.55-1
+* Mon Nov 02 2020 Simon Pichugin <spichugi@redhat.com> - 2.4.55-1
 - Rebase to version 2.4.55 (#1891622)
 
-* Thu Oct 13 2020 Simon Pichugin <spichugi@redhat.com> - 2.4.54-1
+* Tue Oct 13 2020 Simon Pichugin <spichugi@redhat.com> - 2.4.54-1
 - Rebase to version 2.4.54 (#1887581)
 
 * Thu Sep 10 2020 Simon Pichugin <spichugi@redhat.com> - 2.4.53-1