diff --git a/openldap.spec b/openldap.spec
index e3964ae..e4bdd82 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -5,7 +5,7 @@
 
 Name: openldap
 Version: 2.4.46
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: LDAP support libraries
 License: OpenLDAP
 URL: http://www.openldap.org/
@@ -138,7 +138,7 @@ popd
 
 %set_build_flags
 # enable experimental support for LDAP over UDP (LDAP_CONNECTIONLESS)
-export CFLAGS="${CFLAGS} ${LDFLAGS} -Wl,--as-needed -DLDAP_CONNECTIONLESS"
+export CFLAGS="${CFLAGS} ${LDFLAGS} -Wl,--as-needed -DLDAP_CONNECTIONLESS -DLDAP_USE_NON_BLOCKING_TLS"
 
 pushd openldap-%{version}
 %configure \
@@ -479,6 +479,10 @@ exit 0
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jul  6 2018 Matus Honek <mhonek@redhat.com> - 2.4.46-6
+- Build with LDAP_USE_NON_BLOCKING_TLS (#1594928)
+- Remove unused leftover MozNSS Compat. Layer references (cont.) (#1557967)
+
 * Fri Jul 06 2018 Petr Pisar <ppisar@redhat.com> - 2.4.46-5
 - Perl 5.28 rebuild