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..67eac7f 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:886051bc53a640882ed269498973f77eb1754459923b3132039ec8c00f6ad42c
+size 4586
diff --git a/openldap2-client.changes b/openldap2-client.changes
index dee135f..2a80cef 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Mon May 10 13:35:59 UTC 2010 - rhafer@novell.com
+
+- Create /var/run/slapd on demand. /var/run might be mounted on 
+  tmpfs.
+
+-------------------------------------------------------------------
+Thu Apr 15 08:18:49 UTC 2010 - adrian@suse.de
+
+- fix build dependency cycle for -client package with openslp
+
+-------------------------------------------------------------------
+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..b6a952d 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package openldap2-client (Version 2.4.21)
+# spec file for package openldap2 (Version 2.4.21)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,8 +19,8 @@
 
 %define run_test_suite 1
 
-Name:           openldap2-client
-BuildRequires:  cyrus-sasl-devel db-devel libopenssl-devel openslp-devel tcpd-devel
+Name:         openldap2-client
+BuildRequires:  cyrus-sasl-devel db-devel libopenssl-devel tcpd-devel
 %if %sles_version == 9
 BuildRequires:  -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel
 %endif
@@ -28,10 +28,11 @@ 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:        4
 Url:            http://www.openldap.org
 License:        BSD3c(or similar) ; openldap 2.8
 %if "%{name}" == "openldap2"
+BuildRequires:  openslp-devel
 Group:          Productivity/Networking/LDAP/Clients
 Conflicts:      openldap
 Requires:       libldap-2_4-2 = %{version}
@@ -54,7 +55,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 +173,6 @@ Authors:
 %setup -q -n openldap-%{version} -a1 -a2 -b100
 %patch1
 %patch2
-%patch3
 %patch4
 %patch5
 %patch6
@@ -336,7 +335,7 @@ cat >openldap2.filelist <<EOF
 %dir /usr/lib/openldap/modules
 /usr/lib/openldap/slapd
 %dir %attr(0700, ldap, ldap) /var/lib/ldap
-%dir %attr(0711, ldap, ldap) /var/run/slapd
+%dir %attr(0755, ldap, ldap) %ghost /var/run/slapd
 %doc %{_mandir}/man8/sl*
 %doc %{_mandir}/man5/slapd.*
 %doc %{_mandir}/man5/slapd-bdb.*
diff --git a/openldap2.changes b/openldap2.changes
index dee135f..2a80cef 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Mon May 10 13:35:59 UTC 2010 - rhafer@novell.com
+
+- Create /var/run/slapd on demand. /var/run might be mounted on 
+  tmpfs.
+
+-------------------------------------------------------------------
+Thu Apr 15 08:18:49 UTC 2010 - adrian@suse.de
+
+- fix build dependency cycle for -client package with openslp
+
+-------------------------------------------------------------------
+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..676e64f 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -20,7 +20,7 @@
 %define run_test_suite 1
 
 Name:           openldap2
-BuildRequires:  cyrus-sasl-devel db-devel libopenssl-devel openslp-devel tcpd-devel
+BuildRequires:  cyrus-sasl-devel db-devel libopenssl-devel tcpd-devel
 %if %sles_version == 9
 BuildRequires:  -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel
 %endif
@@ -28,10 +28,11 @@ 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:        4
 Url:            http://www.openldap.org
 License:        BSD3c(or similar) ; openldap 2.8
 %if "%{name}" == "openldap2"
+BuildRequires:  openslp-devel
 Group:          Productivity/Networking/LDAP/Clients
 Conflicts:      openldap
 Requires:       libldap-2_4-2 = %{version}
@@ -54,7 +55,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 +173,6 @@ Authors:
 %setup -q -n openldap-%{version} -a1 -a2 -b100
 %patch1
 %patch2
-%patch3
 %patch4
 %patch5
 %patch6
@@ -336,7 +335,7 @@ cat >openldap2.filelist <<EOF
 %dir /usr/lib/openldap/modules
 /usr/lib/openldap/slapd
 %dir %attr(0700, ldap, ldap) /var/lib/ldap
-%dir %attr(0711, ldap, ldap) /var/run/slapd
+%dir %attr(0755, ldap, ldap) %ghost /var/run/slapd
 %doc %{_mandir}/man8/sl*
 %doc %{_mandir}/man5/slapd.*
 %doc %{_mandir}/man5/slapd-bdb.*