diff --git a/openldap2-client.changes b/openldap2-client.changes
index 18eae5f..c63758f 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 27 10:57:53 CEST 2008 - coolo@suse.de
+
+- make sure the subpacks are only in one spec file declared
+
 -------------------------------------------------------------------
 Tue Jun 24 11:08:00 CEST 2008 - rhafer@suse.de
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index a905a0b..5a16602 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -29,7 +29,7 @@ Summary:        OpenLDAP Client Utilities
 %endif
 AutoReqProv:    on
 Version:        2.4.10
-Release:        2
+Release:        5
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        addonschema.tar.gz
@@ -59,6 +59,8 @@ Authors:
 --------
     The OpenLDAP Project <project@openldap.org>
 
+%if "%{name}" == "openldap2"
+
 %package      -n openldap2-back-perl
 License:        BSD 3-Clause
 Summary:        OpenLDAP Perl Back-End
@@ -96,6 +98,8 @@ Authors:
 --------
     The OpenLDAP Project <project@openldap.org>
 
+%else
+
 %package      -n openldap2-devel
 License:        BSD 3-Clause; openldap 2.8
 Summary:        Libraries, Header Files and Documentation for OpenLDAP
@@ -115,7 +119,7 @@ Authors:
     The OpenLDAP Project <project@openldap.org>
 
 %package      -n libldap-2_4-2
-License:        BSD 3-Clause
+License:        BSD 3-Clause; openldap 2.8
 Summary:        OpenLDAP Client Libraries
 AutoReqProv:    on
 Group:          Productivity/Networking/LDAP/Clients
@@ -129,6 +133,8 @@ Authors:
 --------
     The OpenLDAP Project <project@openldap.org>
 
+%endif
+
 %prep
 %setup -q -n openldap-%{version} -a1 -a2 -b100
 %patch
@@ -466,6 +472,8 @@ fi
 %endif
 
 %changelog
+* Fri Jun 27 2008 coolo@suse.de
+- make sure the subpacks are only in one spec file declared
 * Tue Jun 24 2008 rhafer@suse.de
 - branched off libldap-2_4-2 package to support the shared library
   packaging policy
diff --git a/openldap2.changes b/openldap2.changes
index 18eae5f..c63758f 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 27 10:57:53 CEST 2008 - coolo@suse.de
+
+- make sure the subpacks are only in one spec file declared
+
 -------------------------------------------------------------------
 Tue Jun 24 11:08:00 CEST 2008 - rhafer@suse.de
 
diff --git a/openldap2.spec b/openldap2.spec
index e9eb005..0be69cd 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -29,7 +29,7 @@ Summary:        The OpenLDAP Server
 %endif
 AutoReqProv:    on
 Version:        2.4.10
-Release:        2
+Release:        5
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        addonschema.tar.gz
@@ -62,6 +62,8 @@ Authors:
 --------
     The OpenLDAP Project <project@openldap.org>
 
+%if "%{name}" == "openldap2"
+
 %package      -n openldap2-back-perl
 License:        BSD 3-Clause
 Summary:        OpenLDAP Perl Back-End
@@ -99,6 +101,8 @@ Authors:
 --------
     The OpenLDAP Project <project@openldap.org>
 
+%else
+
 %package      -n openldap2-devel
 License:        BSD 3-Clause; openldap 2.8
 Summary:        Libraries, Header Files and Documentation for OpenLDAP
@@ -118,7 +122,7 @@ Authors:
     The OpenLDAP Project <project@openldap.org>
 
 %package      -n libldap-2_4-2
-License:        BSD 3-Clause
+License:        BSD 3-Clause; openldap 2.8
 Summary:        OpenLDAP Client Libraries
 AutoReqProv:    on
 Group:          Productivity/Networking/LDAP/Clients
@@ -132,6 +136,8 @@ Authors:
 --------
     The OpenLDAP Project <project@openldap.org>
 
+%endif
+
 %prep
 %setup -q -n openldap-%{version} -a1 -a2 -b100
 %patch
@@ -469,6 +475,8 @@ fi
 %endif
 
 %changelog
+* Fri Jun 27 2008 coolo@suse.de
+- make sure the subpacks are only in one spec file declared
 * Tue Jun 24 2008 rhafer@suse.de
 - branched off libldap-2_4-2 package to support the shared library
   packaging policy