diff --git a/openldap.spec b/openldap.spec
index 3beb28f..1c05d17 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -13,7 +13,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -274,7 +274,7 @@ buildbdb() {
 		./libtool --mode=compile %{__cc} -o $nptl_lo -c $nptl_s
 	fi
 	make %{_smp_mflags} libdb_base=libslapd_db libso_base=libslapd_db LIBSO_LIBS="$nptl_lo"
-	make install libdb_base=libslapd_db libso_base=libslapd_db LIBSO_LIBS="$nptl_lo"
+	make install libdb_base=libslapd_db libso_base=libslapd_db LIBSO_LIBS="$nptl_lo" strip="false"
 	ln -sf libslapd_db.so ${dbdir}/%{_lib}/${subdir}/libdb.so
 	popd
 }
@@ -413,7 +413,7 @@ tagname=CC; export tagname
 # libraries share sonames, so we have to choose one or the other.
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/
 pushd openldap-%{compat_version}/build-compat/libraries
-	make install DESTDIR=$RPM_BUILD_ROOT
+	make install DESTDIR=$RPM_BUILD_ROOT STRIP=""
 	rm $RPM_BUILD_ROOT/%{_libdir}/*.a
 	rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 	rm $RPM_BUILD_ROOT/%{_libdir}/*.so
@@ -444,7 +444,7 @@ install -m755 libslapd_db-*.*.so $RPM_BUILD_ROOT/%{_libdir}/
 popd
 
 pushd openldap-%{version_23}/build-servers
-make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} LIBTOOL="$libtool"
+make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} LIBTOOL="$libtool" STRIP=""
 popd
 
 # Install the bdb maintenance tools.
@@ -460,13 +460,15 @@ pushd evo-openldap-%{version_23}
 make install DESTDIR=$RPM_BUILD_ROOT \
 	includedir=%{evolution_connector_includedir} \
 	libdir=%{evolution_connector_libdir} \
-	LIBTOOL="$libtool"
+	LIBTOOL="$libtool" \
+	STRIP=""
+
 install -m644 \
 	$RPM_SOURCE_DIR/README.evolution \
 	$RPM_BUILD_ROOT/%{evolution_connector_prefix}/
 popd
 pushd openldap-%{version_23}/build-clients
-make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} LIBTOOL="$libtool"
+make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} LIBTOOL="$libtool" STRIP=""
 popd
 
 # Create this directory so that authconfig setting TLS_CACERT to
@@ -716,13 +718,15 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
-* Mon Apr 23 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-1%{?dist}
+* Mon Apr 23 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-2%{?dist}
 - slapadd during package update is now quiet (bz#224581)
 - use _localstatedir instead of var/ during build (bz#220970)
 - bind-libbind-devel removed from BuildRequires (bz#216851)
 - slaptest is now quiet during service ldap start, if
   there is no error/warning (bz#143697)
 - libldap_r.so now links with pthread (bz#198226)
+- do not strip binaries to produce correct .debuginfo packages
+  (bz#152516)
 
 * Mon Feb 19 2007 Jay Fenlason <fenlason<redhat.com> 2.3.34-1%{?dist}
 - New upstream release