diff --git a/addonschema.tar.gz b/addonschema.tar.gz
index 6dd57ac..9fd432f 100644
--- a/addonschema.tar.gz
+++ b/addonschema.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15df0033de48dd895e7c01da77f98848e23218fa109ecbedb789229d59dad459
-size 3227
+oid sha256:a1a0de4fe8c80b0210a706a9e8313b3c2f8b72b2de88961acf433a4e09752a4f
+size 3480
diff --git a/openldap2-client.changes b/openldap2-client.changes
index 3c3716d..4a16a15 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Aug 28 11:46:08 CEST 2008 - rhafer@suse.de
+
+- added ldapns.schema , to allow to use pam_ldap's "check_host_attr" 
+  and "check_service_attr" features (bnc#419984)
+- backport overlay_register_control fix from HEAD (bnc#420016, 
+  ITS#5649)
+
 -------------------------------------------------------------------
 Mon Aug 18 18:10:07 CEST 2008 - mrueckert@suse.de
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index 1104ea1..a1d9f38 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -42,7 +42,7 @@ Summary:        OpenLDAP Client Utilities
 %endif
 AutoReqProv:    on
 Version:        2.4.11
-Release:        15
+Release:        19
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        addonschema.tar.gz
@@ -60,6 +60,7 @@ Patch6:         libldap-gethostbyname_r.dif
 Patch7:         pie-compile.dif
 Patch8:         slapd_getaddrinfo_dupl.dif
 Patch9:         openldap2-add-gnu-source.diff
+Patch10:        slapd-overlay_register_control.dif
 Patch100:       openldap-2.3.37.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -162,6 +163,7 @@ Authors:
 %endif
 %patch8 -p1
 %patch9 -p1
+%patch10
 cp %{SOURCE5} .
 cd ../openldap-2.3.37
 %patch100
@@ -487,6 +489,11 @@ fi
 %endif
 
 %changelog
+* Thu Aug 28 2008 rhafer@suse.de
+- added ldapns.schema , to allow to use pam_ldap's "check_host_attr"
+  and "check_service_attr" features (bnc#419984)
+- backport overlay_register_control fix from HEAD (bnc#420016,
+  ITS#5649)
 * Mon Aug 18 2008 mrueckert@suse.de
 - remove outdated options in the fillup_and_insserv call
 * Mon Aug 18 2008 rhafer@suse.de
diff --git a/openldap2.changes b/openldap2.changes
index 3c3716d..4a16a15 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Aug 28 11:46:08 CEST 2008 - rhafer@suse.de
+
+- added ldapns.schema , to allow to use pam_ldap's "check_host_attr" 
+  and "check_service_attr" features (bnc#419984)
+- backport overlay_register_control fix from HEAD (bnc#420016, 
+  ITS#5649)
+
 -------------------------------------------------------------------
 Mon Aug 18 18:10:07 CEST 2008 - mrueckert@suse.de
 
diff --git a/openldap2.spec b/openldap2.spec
index c1d95be..ef28838 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -42,7 +42,7 @@ Summary:        The OpenLDAP Server
 %endif
 AutoReqProv:    on
 Version:        2.4.11
-Release:        14
+Release:        18
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        addonschema.tar.gz
@@ -60,6 +60,7 @@ Patch6:         libldap-gethostbyname_r.dif
 Patch7:         pie-compile.dif
 Patch8:         slapd_getaddrinfo_dupl.dif
 Patch9:         openldap2-add-gnu-source.diff
+Patch10:        slapd-overlay_register_control.dif
 Patch100:       openldap-2.3.37.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -165,6 +166,7 @@ Authors:
 %endif
 %patch8 -p1
 %patch9 -p1
+%patch10
 cp %{SOURCE5} .
 cd ../openldap-2.3.37
 %patch100
@@ -490,6 +492,11 @@ fi
 %endif
 
 %changelog
+* Thu Aug 28 2008 rhafer@suse.de
+- added ldapns.schema , to allow to use pam_ldap's "check_host_attr"
+  and "check_service_attr" features (bnc#419984)
+- backport overlay_register_control fix from HEAD (bnc#420016,
+  ITS#5649)
 * Mon Aug 18 2008 mrueckert@suse.de
 - remove outdated options in the fillup_and_insserv call
 * Mon Aug 18 2008 rhafer@suse.de
diff --git a/slapd-overlay_register_control.dif b/slapd-overlay_register_control.dif
new file mode 100644
index 0000000..81fe98d
--- /dev/null
+++ b/slapd-overlay_register_control.dif
@@ -0,0 +1,28 @@
+Index: servers/slapd/backover.c
+===================================================================
+RCS file: /repo/OpenLDAP/pkg/ldap/servers/slapd/backover.c,v
+retrieving revision 1.87
+retrieving revision 1.88
+diff -u -r1.87 -r1.88
+--- servers/slapd/backover.c	12 Jul 2008 09:53:49 -0000	1.87
++++ servers/slapd/backover.c	9 Aug 2008 08:11:41 -0000	1.88
+@@ -1063,7 +1063,7 @@
+ 		
+ 		/* add to all backends... */
+ 		LDAP_STAILQ_FOREACH( bd, &backendDB, be_next ) {
+-			if ( be == bd ) {
++			if ( bd == be->bd_self ) {
+ 				gotit = 1;
+ 			}
+ 
+@@ -1074,8 +1074,8 @@
+ 	}
+ 	
+ 	if ( !gotit ) {
+-		be->be_ctrls[ cid ] = 1;
+-		be->be_ctrls[ SLAP_MAX_CIDS ] = 1;
++		be->bd_self->be_ctrls[ cid ] = 1;
++		be->bd_self->be_ctrls[ SLAP_MAX_CIDS ] = 1;
+ 	}
+ 
+ 	return 0;