diff --git a/openldap-2.4.19-tls-accept.patch b/openldap-2.4.19-tls-accept.patch
deleted file mode 100644
index d7484b7..0000000
--- a/openldap-2.4.19-tls-accept.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- openldap-2.4.19/servers/slapd/connection.c.orig	2009-11-16 12:54:33.000000000 +0100
-+++ openldap-2.4.19/servers/slapd/connection.c	2009-11-16 13:23:25.000000000 +0100
-@@ -1376,6 +1376,11 @@ connection_read( ber_socket_t s, conn_re
- 			    c->c_connid, (int) s, c->c_tls_ssf, c->c_ssf, 0 );
- 			slap_sasl_external( c, c->c_tls_ssf, &authid );
- 			if ( authid.bv_val ) free( authid.bv_val );
-+		} else if ( rc == 1 ) { /* need to retry */
-+			slapd_set_read( s, 0 );
-+			slapd_set_write( s, 1 );
-+			connection_return( c );
-+			return 0;
- 		}
- 
- 		/* if success and data is ready, fall thru to data input loop */
-@@ -1875,6 +1880,14 @@ int connection_write(ber_socket_t s)
- 		return -1;
- 	}
- 
-+#ifdef HAVE_TLS
-+	if ( c->c_is_tls && c->c_needs_tls_accept ) {
-+		connection_return( c );
-+		connection_read_activate( s );
-+		return 0;
-+	}
-+#endif
-+
- 	c->c_n_write++;
- 
- 	Debug( LDAP_DEBUG_TRACE,
diff --git a/openldap-2.4.21-dn2id-segfault.patch b/openldap-2.4.21-dn2id-segfault.patch
new file mode 100644
index 0000000..411f06a
--- /dev/null
+++ b/openldap-2.4.21-dn2id-segfault.patch
@@ -0,0 +1,11 @@
+--- openldap-2.4.19/servers/slapd/back-bdb/dn2id.c.orig	2010-02-24 09:55:39.000000000 +0100
++++ openldap-2.4.19/servers/slapd/back-bdb/dn2id.c	2010-02-24 09:56:07.000000000 +0100
+@@ -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 );
diff --git a/openldap.spec b/openldap.spec
index a30c0f8..0fd48e8 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -35,6 +35,7 @@ Patch6: openldap-2.3.19-gethostbyXXXX_r.patch
 Patch9: openldap-2.3.37-smbk5pwd.patch
 Patch10: openldap-2.4.6-multilib.patch
 Patch11: openldap-2.4.16-doc-cacertdir.patch
+Patch12: openldap-2.4.21-dn2id-segfault.patch
 
 # Patches for the evolution library
 Patch200: openldap-2.4.6-evolution-ntlm.patch
@@ -130,6 +131,7 @@ pushd openldap-%{version}
 %patch9 -p1 -b .smbk5pwd
 %patch10 -p1 -b .multilib
 %patch11 -p1 -b .cacertdir
+%patch12 -p1 -b .segfault
 
 cp %{_datadir}/libtool/config/config.{sub,guess} build/
 popd
@@ -629,6 +631,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Wed Feb 24 2010 Jan Zeleny <jzeleny@redhat.com> - 2.4.21-4
+- fixed SIGSEGV when deleting data using hdb (#562227)
+
 * Mon Feb 01 2010 Jan Zeleny <jzeleny@redhat.com> - 2.4.21-3
 - fixed broken link /usr/sbin/slapschema (#559873)