diff --git a/gcc14-v2.patch b/gcc14-v2.patch
new file mode 100644
index 0000000..9bd80ab
--- /dev/null
+++ b/gcc14-v2.patch
@@ -0,0 +1,25 @@
+Index: openldap-2.6.7/contrib/slapd-modules/cloak/cloak.c
+===================================================================
+--- openldap-2.6.7.orig/contrib/slapd-modules/cloak/cloak.c
++++ openldap-2.6.7/contrib/slapd-modules/cloak/cloak.c
+@@ -242,6 +242,7 @@ cloak_search_response_cb( Operation *op,
+ 			else
+ 				me->e_attrs = a->a_next;
+ 
++			extern void attr_clean(Attribute *);
+ 			attr_clean( a );
+ 		}
+
+Index: openldap-2.6.7/libraries/liblmdb/mdb.c
+===================================================================
+--- openldap-2.6.7.orig/libraries/liblmdb/mdb.c
++++ openldap-2.6.7/libraries/liblmdb/mdb.c
+@@ -5161,7 +5161,7 @@ mdb_env_close0(MDB_env *env, int excl)
+ 
+ 		// No need to call desctructor anymore, as all pid
+ 		// values are cleared below.
+-		env->me_txkey = NULL;
++		memset(&env->me_txkey, 0, sizeof(env->me_txkey));
+ 
+ #ifdef _WIN32
+ 		/* Delete our key from the global list */
diff --git a/openldap2.changes b/openldap2.changes
index 91a3847..0e0513a 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Aug  7 11:42:49 UTC 2024 - Filip Kastl <filip.kastl@suse.com>
+
+- Add back two hunks from gcc14.patch as gcc14-v2.patch.  Not all
+  bugs that gcc14.patch fixed were dealt with in the upstream --
+  one bug is caused by
+  0016-Clear-shared-key-only-in-close-function.patch and one bug
+  still remains in the upstream.
+
 -------------------------------------------------------------------
 Wed Jul 31 05:11:48 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/openldap2.spec b/openldap2.spec
index 1aa39cb..8e8bf93 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -56,6 +56,7 @@ Patch3:         0003-LDAPI-socket-location.dif
 Patch5:         0005-pie-compile.dif
 Patch8:         0008-In-monitor-backend-do-not-return-Connection0-entries.patch
 Patch16:        0016-Clear-shared-key-only-in-close-function.patch
+Patch17:        gcc14-v2.patch
 BuildRequires:  argon2-devel
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  db-devel