diff --git a/openldap.spec b/openldap.spec
index 155a674..13ac044 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -7,7 +7,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP.
 Name: openldap
 Version: 2.1.29
-Release: 2
+Release: 3
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -29,6 +29,7 @@ Patch2: openldap-1.2.11-cldap.patch
 Patch3: openldap-2.1.17-syslog.patch
 Patch4: openldap-2.0.11-ldaprc.patch
 Patch5: openldap-2.1.17-susesec.patch
+Patch6: openldap-2.1.29-pie.patch
 Patch12: db-4.0.14-disable-mutex.patch
 Patch13: db-4.0.14-libobjs.patch
 Patch21: MigrationTools-38-instdir.patch
@@ -40,7 +41,7 @@ Patch30: http://www.sleepycat.com/update/4.2.52/patch.4.2.52.1
 Patch31: http://www.sleepycat.com/update/4.2.52/patch.4.2.52.2
 URL: http://www.openldap.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildPreReq: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5, krb5-devel
+BuildPreReq: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5.6-2, krb5-devel
 BuildPreReq: openssl-devel, pam-devel, perl, pkgconfig, tcp_wrappers
 Requires: cyrus-sasl, cyrus-sasl-md5, mktemp
 
@@ -103,6 +104,7 @@ programs needed for accessing and modifying OpenLDAP directories.
 %patch3 -p1 -b .syslog
 %patch4 -p1 -b .ldaprc
 %patch5 -p1 -b .susesec
+%patch6 -p1 -b .pie
 
 pushd db-%{db_version_40}
 %patch12 -p1 -b .disable-mutex
@@ -230,6 +232,9 @@ buildbdb() {
 	# XXX db-4.2.x handles O_DIRECT (by disabling on linux) correctly.
 	# XXX hack out O_DIRECT support in db4 for now.
 	perl -pi -e 's/#define HAVE_O_DIRECT 1/#undef HAVE_O_DIRECT/' db_config.h
+	# fix libtool: no rpath
+        perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
+
 	if test -n "$nptl_lo" ; then
 		./libtool --mode=compile %{__cc} -o $nptl_lo -c $nptl_s
 	fi
@@ -529,6 +534,11 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Thu May 13 2004 Thomas Woerner <twoerner@redhat.com> 2.1.29-3
+- removed rpath
+- added pie patch: slapd and slurpd are now pie
+- requires libtool >= 1.5.6-2 (PIC libltdl.a)
+
 * Fri Apr 16 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.29-2
 - move rfc documentation from main to -devel (#121025)