diff --git a/.gitignore b/.gitignore
index 11a76df..1284f15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,6 @@
 /openldap-2.5.7.tgz
 /openldap-2.5.8.tgz
 /openldap-2.6.1.tgz
+/openldap-2.6.2.tgz
+/openldap-2.6.3.tgz
+/openldap-2.6.4.tgz
diff --git a/openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch b/openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch
new file mode 100644
index 0000000..0c1b3bb
--- /dev/null
+++ b/openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch
@@ -0,0 +1,37 @@
+From 6779e56fafb0aa8ae5efa7068da34a630b51b530 Mon Sep 17 00:00:00 2001
+From: Simon Pichugin <spichugi@redhat.com>
+Date: Fri, 5 Aug 2022 13:23:52 -0700
+Subject: [PATCH] Add export symbols related to LDAP_CONNECTIONLESS
+
+---
+ libraries/liblber/lber.map | 1 +
+ libraries/libldap/ldap.map | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/libraries/liblber/lber.map b/libraries/liblber/lber.map
+index 9a4094b0f..083cd1f32 100644
+--- a/libraries/liblber/lber.map
++++ b/libraries/liblber/lber.map
+@@ -121,6 +121,7 @@ OPENLDAP_2.200
+     ber_sockbuf_io_fd;
+     ber_sockbuf_io_readahead;
+     ber_sockbuf_io_tcp;
++    ber_sockbuf_io_udp;
+     ber_sockbuf_remove_io;
+     ber_sos_dump;
+     ber_start;
+diff --git a/libraries/libldap/ldap.map b/libraries/libldap/ldap.map
+index b28c9c21e..021aaba63 100644
+--- a/libraries/libldap/ldap.map
++++ b/libraries/libldap/ldap.map
+@@ -200,6 +200,7 @@ OPENLDAP_2.200
+     ldap_is_ldap_url;
+     ldap_is_ldapi_url;
+     ldap_is_ldaps_url;
++    ldap_is_ldapc_url;
+     ldap_is_read_ready;
+     ldap_is_write_ready;
+     ldap_ld_free;
+-- 
+2.37.1
+
diff --git a/openldap-fix-missing-mapping.patch b/openldap-fix-missing-mapping.patch
deleted file mode 100644
index dd4a7cc..0000000
--- a/openldap-fix-missing-mapping.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 59e013602d7b1aa0d7da79d65367c9ec391b96f8 Mon Sep 17 00:00:00 2001
-From: Simon Pichugin <spichugi@redhat.com>
-Date: Wed, 3 Nov 2021 19:03:40 -0700
-Subject: [PATCH] Fix missing mapping
-
----
- libraries/liblber/lber.map | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libraries/liblber/lber.map b/libraries/liblber/lber.map
-index 9a4094b0f..083cd1f32 100644
---- a/libraries/liblber/lber.map
-+++ b/libraries/liblber/lber.map
-@@ -121,6 +121,7 @@ OPENLDAP_2.200
-     ber_sockbuf_io_fd;
-     ber_sockbuf_io_readahead;
-     ber_sockbuf_io_tcp;
-+    ber_sockbuf_io_udp;
-     ber_sockbuf_remove_io;
-     ber_sos_dump;
-     ber_start;
--- 
-2.31.1
-
diff --git a/openldap.spec b/openldap.spec
index 20853b6..27ce5a5 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -13,8 +13,8 @@
 %global __brp_remove_la_files %nil
 
 Name: openldap
-Version: 2.6.1
-Release: 2%{?dist}
+Version: 2.6.4
+Release: 1%{?dist}
 Summary: LDAP support libraries
 License: OpenLDAP
 URL: http://www.openldap.org/
@@ -45,7 +45,7 @@ Patch6: openldap-switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.patch
 
 # System-wide default for CA certs
 Patch7: openldap-openssl-manpage-defaultCA.patch
-Patch8: openldap-fix-missing-mapping.patch
+Patch8: openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch
 
 # check-password module specific patches
 Patch90: check-password-makefile.patch
@@ -239,7 +239,7 @@ popd
 mkdir -p %{buildroot}%{_libdir}/
 
 pushd openldap-%{version}
-%make_install STRIP=""
+%make_install STRIP_OPTS=""
 popd
 
 # install check_password module
@@ -504,14 +504,31 @@ exit 0
 %{_libdir}/libslapi-2.4*.so.*
 
 %changelog
+* Tue Mar 07 2023 Simon Pichugin <spichugi@redhat.com> - 2.6.4-1
+- Rebase to version 2.6.4
+  Related: rhbz#2176319
+
+* Wed Aug 17 2022 Simon Pichugin <spichugi@redhat.com> - 2.6.3-1
+- Rebase to version 2.6.3
+  Related: rhbz#2119231
+
+* Mon Aug 15 2022 Simon Pichugin <spichugi@redhat.com> - 2.6.2-3
+- Add export symbols related to LDAP_CONNECTIONLESS
+  Related: rhbz#2117828
+
+* Mon Jun 27 2022 Simon Pichugin <spichugi@redhat.com> - 2.6.2-2
+- Fix debuginfo missing issue (#2101614)
+
+* Wed May 25 2022 Simon Pichugin <spichugi@redhat.com> - 2.6.2-1
+- Rebase to version 2.6.2 (#2090447)
+
 * Wed Feb 2 2022 Simon Pichugin <spichugi@redhat.com> - 2.6.1-2
 - Fix twice packaged compat libraries issue (#2049085)
 
 * Mon Jan 31 2022 Simon Pichugin <spichugi@redhat.com> - 2.6.1-1
 - Update to new major release OpenLDAP 2.6.1 (#1955293)
   + rediff all patches and remove patches now upstream
-  + use upstream source location for check password module
-  + and rediff patch due to this
+  + use upstream source location for check password module + and rediff patch due to this
   + add patch to fix build issue in 2.5.4 (from upstream)
   + clean and sort buildreqs
   + remove various refs to bdb
diff --git a/sources b/sources
index 3ecf658..b1f9a2d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (openldap-2.6.1.tgz) = bdb961225313bc2717aabac7ba1dfcaabba7c933ab1c28959315b5e88074af0575f082c329fdfc0adde61b6b0e56315305156cee7eb879bc8e48b47cb9f5cd58
 SHA512 (openldap-ppolicy-check-password-1.1.tar.gz) = a92854d7438cb95fac361da80a49d084d502155e8ce0ad2ea679db9529bbe0182aa4354e6139793c775e496349375d8f017678941d23315ff1c20fefc9573cdc
+SHA512 (openldap-2.6.4.tgz) = 4be49c4866e47e96677d0e1f7caa380791917c9df8d6bb343d032aba45031c87db3bd4f6b953e914a1f40044fa68f4886ae96929a410b7188c0ed9bb75073a30