diff --git a/openldap2-client.changes b/openldap2-client.changes
index 9943616..9149f32 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 18 15:16:43 CEST 2007 - schwab@suse.de
+
+- Fix generation of debuginfo packages.
+
 -------------------------------------------------------------------
 Tue Mar 20 17:08:37 CET 2007 - rguenther@suse.de
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index 3e88ed6..834dc3b 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -28,7 +28,7 @@ Summary:        OpenLDAP2 Client Utilities
 %endif
 Autoreqprov:    on
 Version:        2.3.34
-Release:        5
+Release:        10
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        openldap-admin-guide.tar.bz2
@@ -57,7 +57,6 @@ Authors:
 --------
     The OpenLDAP Project <project@openldap.org>
 
-%if "%{name}" == "openldap2"
 %package      -n openldap2-back-perl
 Summary:        OpenLDAP Perl Back-End
 Requires:       openldap2 = %{version}
@@ -93,7 +92,6 @@ Authors:
 --------
     The OpenLDAP Project <project@openldap.org>
 
-%else
 %package      -n openldap2-devel
 Summary:        Libraries, Header Files and Documentation for OpenLDAP2
 Autoreqprov:    on
@@ -111,7 +109,6 @@ Authors:
 --------
     The OpenLDAP Project <project@openldap.org>
 
-%endif
 %prep
 %setup -q -n openldap-%{version} -a1 -a2 -a3 
 %patch
@@ -183,7 +180,6 @@ make test
 %endif
 
 %install
-#[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -347,6 +343,8 @@ fi
 %endif
 
 %changelog
+* Wed Apr 18 2007 - schwab@suse.de
+- Fix generation of debuginfo packages.
 * Tue Mar 20 2007 - rguenther@suse.de
 - removed krb5-devel BuildRequires (support via cyrus-sasl)
 * Thu Mar 15 2007 - rhafer@suse.de
diff --git a/openldap2.changes b/openldap2.changes
index 9943616..9149f32 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 18 15:16:43 CEST 2007 - schwab@suse.de
+
+- Fix generation of debuginfo packages.
+
 -------------------------------------------------------------------
 Tue Mar 20 17:08:37 CET 2007 - rguenther@suse.de
 
diff --git a/openldap2.spec b/openldap2.spec
index abea87b..671c729 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -28,7 +28,7 @@ Summary:        The New OpenLDAP Server (LDAPv3)
 %endif
 Autoreqprov:    on
 Version:        2.3.34
-Release:        5
+Release:        10
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        openldap-admin-guide.tar.bz2
@@ -60,7 +60,6 @@ Authors:
 --------
     The OpenLDAP Project <project@openldap.org>
 
-%if "%{name}" == "openldap2"
 %package      -n openldap2-back-perl
 Summary:        OpenLDAP Perl Back-End
 Requires:       openldap2 = %{version}
@@ -96,7 +95,6 @@ Authors:
 --------
     The OpenLDAP Project <project@openldap.org>
 
-%else
 %package      -n openldap2-devel
 Summary:        Libraries, Header Files and Documentation for OpenLDAP2
 Autoreqprov:    on
@@ -114,7 +112,6 @@ Authors:
 --------
     The OpenLDAP Project <project@openldap.org>
 
-%endif
 %prep
 %setup -q -n openldap-%{version} -a1 -a2 -a3 
 %patch
@@ -186,7 +183,6 @@ make test
 %endif
 
 %install
-#[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -350,6 +346,8 @@ fi
 %endif
 
 %changelog
+* Wed Apr 18 2007 - schwab@suse.de
+- Fix generation of debuginfo packages.
 * Tue Mar 20 2007 - rguenther@suse.de
 - removed krb5-devel BuildRequires (support via cyrus-sasl)
 * Thu Mar 15 2007 - rhafer@suse.de