diff --git a/ldap_conf.dif b/ldap_conf.dif
new file mode 100644
index 0000000..ac0bce8
--- /dev/null
+++ b/ldap_conf.dif
@@ -0,0 +1,8 @@
+--- 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 a5817de..8bf11d9 100644
--- a/openldap-rc.tgz
+++ b/openldap-rc.tgz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7644ec4cd7ba33194e99981d1661b53af9abc5b3eb2d214475ad4b4b067c5928
-size 4488
+oid sha256:c44c098dd07e2d1a8cc01559d61373af59d226225f27716e933052a80a39ee97
+size 4487
diff --git a/openldap2-client.changes b/openldap2-client.changes
index ba6a1fe..dee135f 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,16 +1,3 @@
--------------------------------------------------------------------
-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 726a117..b4078ed 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
@@ -54,6 +54,7 @@ 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
@@ -172,6 +173,7 @@ Authors:
 %setup -q -n openldap-%{version} -a1 -a2 -b100
 %patch1
 %patch2
+%patch3
 %patch4
 %patch5
 %patch6
diff --git a/openldap2.changes b/openldap2.changes
index ba6a1fe..dee135f 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,16 +1,3 @@
--------------------------------------------------------------------
-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 44faf27..873b78a 100644
--- a/openldap2.dif
+++ b/openldap2.dif
@@ -35,4 +35,16 @@ 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 20b593c..764bc52 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -54,6 +54,7 @@ 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
@@ -172,6 +173,7 @@ Authors:
 %setup -q -n openldap-%{version} -a1 -a2 -b100
 %patch1
 %patch2
+%patch3
 %patch4
 %patch5
 %patch6