diff --git a/openldap.spec b/openldap.spec
index cf58cbd..46f5b19 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -2,7 +2,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP.
 Name: openldap
 Version: 2.0.11
-Release: 12
+Release: 13
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -27,11 +27,12 @@ Patch7: openldap-2.0.11-ldaprc.patch
 Patch8: openldap-2.0.11-debug.patch
 Patch9: openldap-2.0.11-libtool.patch
 Patch10: openldap-2.0.11-linkage.patch
-Patch11: MigrationTools-38-instdir.patch
-Patch12: MigrationTools-36-mktemp.patch
-Patch13: MigrationTools-27-simple.patch
-Patch14: MigrationTools-26-suffix.patch
-Patch15: MigrationTools-24-schema.patch
+Patch11: openldap-2.0.11-tls.patch
+Patch21: MigrationTools-38-instdir.patch
+Patch22: MigrationTools-36-mktemp.patch
+Patch23: MigrationTools-27-simple.patch
+Patch24: MigrationTools-26-suffix.patch
+Patch25: MigrationTools-24-schema.patch
 URL: http://www.openldap.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPreReq: autoconf, cyrus-sasl-devel, gdbm-devel, krb5-devel, openssl-devel, pam-devel, perl, tcp_wrappers
@@ -101,12 +102,13 @@ programs needed for accessing and modifying OpenLDAP directories.
 %patch8 -p1 -b .debug
 %patch9 -p1 -b .libtool
 %patch10 -p1 -b .linkage
+%patch11 -p1 -b .tls
 pushd MigrationTools-%{migtools_ver}
-%patch11 -p1 -b .instdir
-%patch12 -p1 -b .mktemp
-%patch13 -p1 -b .simple
-%patch14 -p1 -b .suffix
-%patch15 -p2 -b .schema
+%patch21 -p1 -b .instdir
+%patch22 -p1 -b .mktemp
+%patch23 -p1 -b .simple
+%patch24 -p1 -b .suffix
+%patch25 -p2 -b .schema
 popd
 
 top=`pwd`
@@ -122,7 +124,7 @@ autoconf
 
 %build
 CPPFLAGS="-I/usr/kerberos/include"; export CPPFLAGS
-CFLAGS="$CPPFLAGS $RPM_OPT_FLAGS -D_REENTRANT -fPIC"; export CFLAGS
+CFLAGS="$CPPFLAGS $RPM_OPT_FLAGS -D_REENTRANT -DHAVE_KERBEROS_V -fPIC"; export CFLAGS
 LDFLAGS="-L/usr/kerberos/lib"; export LDFLAGS
 TARGET_PLATFORM=%{_target_platform}
 %define _target_platform --target=${TARGET_PLATFORM}
@@ -195,8 +197,8 @@ cp %{SOURCE4} TOOLS.migration
 
 # try to build saucer, but don't fret if we can't
 if make -C contrib/saucer ; then
-	install -m755 contrib/saucer/saucer $RPM_BUILD_ROOT%{_bindir}/
-	install -m644 contrib/saucer/saucer.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+	./libtool install -m755 contrib/saucer/saucer $RPM_BUILD_ROOT%{_bindir}/
+	./libtool install -m644 contrib/saucer/saucer.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 fi
 
 # create the data directory
@@ -325,6 +327,13 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 21 2001 Nalin Dahyabhai <nalin@redhat.com>
+- install saucer correctly
+
+* Thu Aug 16 2001 Nalin Dahyabhai <nalin@redhat.com>
+- try to fix ldap_set_options not being able to set global options related
+  to TLS correctly
+
 * Thu Aug  9 2001 Nalin Dahyabhai <nalin@redhat.com>
 - don't attempt to create a cert at install-time, it's usually going
   to get the wrong CN (#51352)