diff --git a/openldap2.changes b/openldap2.changes
index cfdbf1a..196cffb 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 17 08:37:00 UTC 2016 - hguo@suse.com
+
+- Enable build flag LDAP_USE_NON_BLOCKING_TLS to fix bsc#978408.
+
 -------------------------------------------------------------------
 Thu Feb 25 11:06:12 UTC 2016 - hguo@suse.com
 
diff --git a/openldap2.spec b/openldap2.spec
index e291383..503cc46 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -267,7 +267,7 @@ mv ../%{name_ppolicy_check_module}-%{version_ppolicy_check_module} contrib/slapd
 cp %{S:201} contrib/slapd-modules/%{name_ppolicy_check_module}/Makefile
 
 %build
-export CFLAGS="%{optflags} -Wno-format-extra-args -fno-strict-aliasing -DNDEBUG -DSLAP_CONFIG_DELETE -DSLAP_SCHEMA_EXPOSE -DLDAP_COLLECTIVE_ATTRIBUTES"
+export CFLAGS="%{optflags} -Wno-format-extra-args -fno-strict-aliasing -DNDEBUG -DSLAP_CONFIG_DELETE -DSLAP_SCHEMA_EXPOSE -DLDAP_COLLECTIVE_ATTRIBUTES -DLDAP_USE_NON_BLOCKING_TLS"
 export STRIP=""
 ./configure \
         --prefix=/usr \