diff --git a/openldap-rc.tgz b/openldap-rc.tgz
index b7f5cd1..84f6244 100644
--- a/openldap-rc.tgz
+++ b/openldap-rc.tgz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:267eca4a573951a6641eb55a7f70814771a479586b4aeb3dc068e29fb337b4c7
-size 4392
+oid sha256:669f8563e7f0d871ebda730da3fa6ad7f6925cd1c63efc8cde873a5975ef8290
+size 4436
diff --git a/openldap2-client.changes b/openldap2-client.changes
index f4e8e87..87aba46 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Oct  6 10:49:23 CEST 2008 - rhafer@suse.de
+
+- remove some problematic test-cases, that cause a lot of 
+  unreproducable buildfailures 
+- check for exisitence of /etc/openldap/slapd.conf in init-script
+  assume back-config usage if it isn't present (bnc#428168)
+
 -------------------------------------------------------------------
 Wed Sep 24 10:58:09 CEST 2008 - rhafer@suse.de
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index 808d0ae..3ccdd8d 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -27,7 +27,7 @@ BuildRequires:  -pwdutils
 BuildRequires:  -db-devel -pwdutils libdb-4_5-devel
 %endif
 Version:        2.4.11
-Release:        29
+Release:        30
 Url:            http://www.openldap.org
 License:        BSD 3-Clause
 %if "%{name}" == "openldap2"
@@ -243,7 +243,16 @@ if [ -f /.buildenv ] ; then
 fi
 export SLAPD_BASEPORT
 %ifnarch %arm alpha
+rm -f tests/scripts/test019-syncreplication-cascade
+rm -f tests/scripts/test023-refint
 rm -f tests/scripts/test022-ppolicy
+rm -f tests/scripts/test033-glue-syncrepl
+rm -f tests/scripts/test036-meta-concurrency
+rm -f tests/scripts/test039-glue-ldap-concurrency
+rm -f tests/scripts/test043-delta-syncrepl
+rm -f tests/scripts/test045-syncreplication-proxied
+rm -f tests/scripts/test048-syncrepl-multiproxy
+rm -f tests/scripts/test050-syncrepl-multimaster
 make SLAPD_DEBUG=0 test
 %endif
 
@@ -497,6 +506,11 @@ fi
 %endif
 
 %changelog
+* Mon Oct 06 2008 rhafer@suse.de
+- remove some problematic test-cases, that cause a lot of
+  unreproducable buildfailures
+- check for exisitence of /etc/openldap/slapd.conf in init-script
+  assume back-config usage if it isn't present (bnc#428168)
 * Wed Sep 24 2008 rhafer@suse.de
 - Mark Schema and SuSEfirewall files as %%config
 - openldap2-back-perl requires perl
diff --git a/openldap2.changes b/openldap2.changes
index f4e8e87..87aba46 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Oct  6 10:49:23 CEST 2008 - rhafer@suse.de
+
+- remove some problematic test-cases, that cause a lot of 
+  unreproducable buildfailures 
+- check for exisitence of /etc/openldap/slapd.conf in init-script
+  assume back-config usage if it isn't present (bnc#428168)
+
 -------------------------------------------------------------------
 Wed Sep 24 10:58:09 CEST 2008 - rhafer@suse.de
 
diff --git a/openldap2.spec b/openldap2.spec
index dc04f47..f5ad6a3 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -27,7 +27,7 @@ BuildRequires:  -pwdutils
 BuildRequires:  -db-devel -pwdutils libdb-4_5-devel
 %endif
 Version:        2.4.11
-Release:        27
+Release:        28
 Url:            http://www.openldap.org
 License:        BSD 3-Clause; openldap 2.8
 %if "%{name}" == "openldap2"
@@ -246,7 +246,16 @@ if [ -f /.buildenv ] ; then
 fi
 export SLAPD_BASEPORT
 %ifnarch %arm alpha
+rm -f tests/scripts/test019-syncreplication-cascade
+rm -f tests/scripts/test023-refint
 rm -f tests/scripts/test022-ppolicy
+rm -f tests/scripts/test033-glue-syncrepl
+rm -f tests/scripts/test036-meta-concurrency
+rm -f tests/scripts/test039-glue-ldap-concurrency
+rm -f tests/scripts/test043-delta-syncrepl
+rm -f tests/scripts/test045-syncreplication-proxied
+rm -f tests/scripts/test048-syncrepl-multiproxy
+rm -f tests/scripts/test050-syncrepl-multimaster
 make SLAPD_DEBUG=0 test
 %endif
 
@@ -500,6 +509,11 @@ fi
 %endif
 
 %changelog
+* Mon Oct 06 2008 rhafer@suse.de
+- remove some problematic test-cases, that cause a lot of
+  unreproducable buildfailures
+- check for exisitence of /etc/openldap/slapd.conf in init-script
+  assume back-config usage if it isn't present (bnc#428168)
 * Wed Sep 24 2008 rhafer@suse.de
 - Mark Schema and SuSEfirewall files as %%config
 - openldap2-back-perl requires perl