diff --git a/openldap2-client.changes b/openldap2-client.changes
index dee135f..3608616 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Sat Feb 13 23:11:03 CET 2010 - rguenther@suse.de
-
-- Add fix for stricter fortification checks of GCC 4.5.
-
 -------------------------------------------------------------------
 Thu Jan  7 15:47:20 UTC 2010 - rhafer@novell.com
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index 792bf96..469b0bc 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package openldap2 (Version 2.4.21)
+# spec file for package openldap2-client (Version 2.4.21)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,7 @@
 
 %define run_test_suite 1
 
-Name:         openldap2-client
+Name:           openldap2-client
 BuildRequires:  cyrus-sasl-devel db-devel libopenssl-devel openslp-devel tcpd-devel
 %if %sles_version == 9
 BuildRequires:  -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel
@@ -56,7 +56,6 @@ Patch1:         openldap2.dif
 Patch2:         slapd_conf.dif
 Patch3:         ldap_conf.dif
 Patch4:         ldapi_url.dif
-Patch5:		slapd-back-hdb-fortify.dif
 Patch6:         libldap-gethostbyname_r.dif
 Patch7:         pie-compile.dif
 Patch11:        slapd-bconfig-del-db.dif
@@ -175,7 +174,6 @@ Authors:
 %patch2
 %patch3
 %patch4
-%patch5
 %patch6
 %if %suse_version > 920
 %patch7
diff --git a/openldap2.changes b/openldap2.changes
index dee135f..3608616 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Sat Feb 13 23:11:03 CET 2010 - rguenther@suse.de
-
-- Add fix for stricter fortification checks of GCC 4.5.
-
 -------------------------------------------------------------------
 Thu Jan  7 15:47:20 UTC 2010 - rhafer@novell.com
 
diff --git a/openldap2.spec b/openldap2.spec
index c2dfffd..c7a86e9 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -56,7 +56,6 @@ Patch1:         openldap2.dif
 Patch2:         slapd_conf.dif
 Patch3:         ldap_conf.dif
 Patch4:         ldapi_url.dif
-Patch5:		slapd-back-hdb-fortify.dif
 Patch6:         libldap-gethostbyname_r.dif
 Patch7:         pie-compile.dif
 Patch11:        slapd-bconfig-del-db.dif
@@ -175,7 +174,6 @@ Authors:
 %patch2
 %patch3
 %patch4
-%patch5
 %patch6
 %if %suse_version > 920
 %patch7
diff --git a/slapd-back-hdb-fortify.dif b/slapd-back-hdb-fortify.dif
deleted file mode 100644
index 6dcea6e..0000000
--- a/slapd-back-hdb-fortify.dif
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: servers/slapd/back-bdb/dn2id.c
-===================================================================
---- servers/slapd/back-bdb/dn2id.c.orig
-+++ servers/slapd/back-bdb/dn2id.c
-@@ -676,7 +676,7 @@ hdb_dn2id_delete(
- 	d->nrdnlen[0] = (BEI(e)->bei_nrdn.bv_len >> 8) | 0x80;
- 	dlen[0] = d->nrdnlen[0];
- 	dlen[1] = d->nrdnlen[1];
--	strcpy( d->nrdn, BEI(e)->bei_nrdn.bv_val );
-+	memcpy ( d->nrdn, BEI(e)->bei_nrdn.bv_val, BEI(e)->bei_nrdn.bv_len + 1);
- 	data.data = d;
- 
- 	rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );