diff --git a/ldap_conf.dif b/ldap_conf.dif
deleted file mode 100644
index ac0bce8..0000000
--- a/ldap_conf.dif
+++ /dev/null
@@ -1,8 +0,0 @@
---- libraries/libldap/ldap.conf	2004/04/01 09:43:12	1.1
-+++ libraries/libldap/ldap.conf	2004/04/01 09:50:42
-@@ -11,3 +11,5 @@
- #SIZELIMIT	12
- #TIMELIMIT	15
- #DEREF		never
-+TLS_REQCERT allow
-+
diff --git a/openldap-rc.tgz b/openldap-rc.tgz
index 8bf11d9..a5817de 100644
--- a/openldap-rc.tgz
+++ b/openldap-rc.tgz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c44c098dd07e2d1a8cc01559d61373af59d226225f27716e933052a80a39ee97
-size 4487
+oid sha256:7644ec4cd7ba33194e99981d1661b53af9abc5b3eb2d214475ad4b4b067c5928
+size 4488
diff --git a/openldap2-client.changes b/openldap2-client.changes
index dee135f..ba6a1fe 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Mar 17 13:06:12 UTC 2010 - rhafer@novell.com
+
+- Fixed quotation in sed expression to escape ldapi path in init
+  script
+
+-------------------------------------------------------------------
+Tue Mar 16 10:01:39 UTC 2010 - rhafer@novell.com
+
+- Removed obsolete hunk from openldap2.dif
+- Remove ldap.conf patch to use saner default for Certificate 
+  verification (bnc#575146)
+
 -------------------------------------------------------------------
 Sat Feb 13 23:11:03 CET 2010 - rguenther@suse.de
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index b4078ed..c9c04be 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -28,7 +28,7 @@ BuildRequires:  -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-de
 BuildRequires:  -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel
 %endif
 Version:        2.4.21
-Release:        2
+Release:        3
 Url:            http://www.openldap.org
 License:        BSD3c(or similar) ; openldap 2.8
 %if "%{name}" == "openldap2"
@@ -54,7 +54,6 @@ Source6:        schema2ldif
 Source100:      openldap-2.3.37.tar.bz2
 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
@@ -173,7 +172,6 @@ Authors:
 %setup -q -n openldap-%{version} -a1 -a2 -b100
 %patch1
 %patch2
-%patch3
 %patch4
 %patch5
 %patch6
diff --git a/openldap2.changes b/openldap2.changes
index dee135f..ba6a1fe 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Mar 17 13:06:12 UTC 2010 - rhafer@novell.com
+
+- Fixed quotation in sed expression to escape ldapi path in init
+  script
+
+-------------------------------------------------------------------
+Tue Mar 16 10:01:39 UTC 2010 - rhafer@novell.com
+
+- Removed obsolete hunk from openldap2.dif
+- Remove ldap.conf patch to use saner default for Certificate 
+  verification (bnc#575146)
+
 -------------------------------------------------------------------
 Sat Feb 13 23:11:03 CET 2010 - rguenther@suse.de
 
diff --git a/openldap2.dif b/openldap2.dif
index 873b78a..44faf27 100644
--- a/openldap2.dif
+++ b/openldap2.dif
@@ -35,16 +35,4 @@ Index: configure.in
  AC_SUBST(PACKAGE)dnl
  AC_SUBST(VERSION)dnl
  AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)
-Index: servers/slapd/aclparse.c
-===================================================================
---- servers/slapd/aclparse.c.orig
-+++ servers/slapd/aclparse.c
-@@ -644,7 +644,7 @@ parse_acl(
- 						if ( rc != LDAP_SUCCESS ) {
- 							char	buf[ SLAP_TEXT_BUFLEN ];
- 
--							snprintf( buf, sizeof( buf ), "%s: line %d: "
-+							snprintf( buf, sizeof( buf ), 
- 								" attr \"%s\" normalization failed (%d: %s)",
- 								fname, lineno,
- 								a->acl_attrs[ 0 ].an_name.bv_val, rc, text );
+
diff --git a/openldap2.spec b/openldap2.spec
index 764bc52..c4726f8 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -28,7 +28,7 @@ BuildRequires:  -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-de
 BuildRequires:  -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel
 %endif
 Version:        2.4.21
-Release:        2
+Release:        3
 Url:            http://www.openldap.org
 License:        BSD3c(or similar) ; openldap 2.8
 %if "%{name}" == "openldap2"
@@ -54,7 +54,6 @@ Source6:        schema2ldif
 Source100:      openldap-2.3.37.tar.bz2
 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
@@ -173,7 +172,6 @@ Authors:
 %setup -q -n openldap-%{version} -a1 -a2 -b100
 %patch1
 %patch2
-%patch3
 %patch4
 %patch5
 %patch6