diff --git a/0016-Clear-shared-key-only-in-close-function.patch b/0016-Clear-shared-key-only-in-close-function.patch
new file mode 100644
index 0000000..994cd1e
--- /dev/null
+++ b/0016-Clear-shared-key-only-in-close-function.patch
@@ -0,0 +1,16 @@
+diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
+index 6bdf3151d..56212151b 100644
+--- a/libraries/liblmdb/mdb.c
++++ b/libraries/liblmdb/mdb.c
+@@ -4692,6 +4692,11 @@ mdb_env_close0(MDB_env *env, int excl)
+ 
+ 	if (env->me_flags & MDB_ENV_TXKEY) {
+ 		pthread_key_delete(env->me_txkey);
++
++		// No need to call desctructor anymore, as all pid
++		// values are cleared below.
++		env->me_txkey = NULL;
++
+ #ifdef _WIN32
+ 		/* Delete our key from the global list */
+ 		for (i=0; i<mdb_tls_nkeys; i++)
diff --git a/openldap2.changes b/openldap2.changes
index 559d279..f9bb53a 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug 17 07:46:47 UTC 2018 - ckowalczyk@suse.com
+
+- Fix slapd segfaults in mdb_env_reader_dest
++  with patch 0016-Clear-shared-key-only-in-close-function.patch
++  (bsc#1089640) 
+
 -------------------------------------------------------------------
 Fri Jun 29 16:23:22 UTC 2018 - michael@stroeder.com
 
diff --git a/openldap2.spec b/openldap2.spec
index f72154b..f104c04 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -67,6 +67,7 @@ Patch11:        0011-openldap-re24-its7796.patch
 Patch12:        0012-ITS8051-sockdnpat.patch
 Patch14:        0014-ITS-8714-Send-out-EXTENDED-operation-message-from-back-sock.patch
 Patch15:        openldap-r-only.dif
+Patch16:        0016-Clear-shared-key-only-in-close-function.patch
 Source200:      %{name_ppolicy_check_module}-%{version_ppolicy_check_module}.tar.gz
 Source201:      %{name_ppolicy_check_module}.Makefile
 Source202:      %{name_ppolicy_check_module}.conf
@@ -265,6 +266,7 @@ gzip -k %{S:203}
 %patch12 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 cp %{SOURCE5} .
 
 # Move ppolicy check module and its Makefile into openldap-2.4/contrib/slapd-modules/