diff --git a/.gitignore b/.gitignore
index 003405d..04c4971 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /openldap-2.4.55.tgz
 /openldap-2.4.56.tgz
 /openldap-2.4.57.tgz
+/openldap-2.4.58.tgz
diff --git a/openldap.spec b/openldap.spec
index 43de793..ba19620 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -6,8 +6,8 @@
 %global so_ver 2
 
 Name: openldap
-Version: 2.4.57
-Release: 3%{?dist}
+Version: 2.4.58
+Release: 1%{?dist}
 Summary: LDAP support libraries
 License: OpenLDAP
 URL: http://www.openldap.org/
@@ -521,6 +521,9 @@ exit 0
 %{_libdir}/libldap-2.4*.so.*
 
 %changelog
+* Tue Mar 23 2021 Simon Pichugin <spichugi@redhat.com> - 2.4.58-1
+- Rebase to version 2.4.58 (#1939663)
+
 * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.4.57-3
 - Rebuilt for updated systemd-rpm-macros
   See https://pagure.io/fesco/issue/2583.
diff --git a/sources b/sources
index b773e89..5bd8a20 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (ltb-project-openldap-ppolicy-check-password-1.1.tar.gz) = f3384a164ce5db488908cf6380bad8500b800b09d12a8f04e1b6ccb6f6af6ab3971fcdbe4acca7a1b6d16b408a11065c2b1ab2497863fe07d3c28262b0f6776e
-SHA512 (openldap-2.4.57.tgz) = b929bced0f5ba9a90e015a24b8037c8958fbb7282db272bd0cacf43b5f7540ab42159a3c4441148074340228bb5f07f93651c0dbb2affde961be156058f99ce5
+SHA512 (openldap-2.4.58.tgz) = 2fa2aa36117692eca44e55559f162c8c796f78469e6c2aee91b06d46f2b755d416979c913a3d89bbf9db14cc84881ecffee69af75b48e1d16b7aa9d2e3873baa