diff --git a/.cvsignore b/.cvsignore
index 77975c6..05d8163 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,4 +4,4 @@ automake-1.4a.tar.gz
 db-4.0.14.tar.gz
 db-4.2.52.tar.gz
 openldap-2.0.27.tgz
-openldap-2.1.25.tgz
+openldap-2.1.29.tgz
diff --git a/openldap.spec b/openldap.spec
index 13c29f9..5c1f57c 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -6,8 +6,8 @@
 %define nptl_arches %{ix86} ia64 ppc ppc64 s390 s390x sparcv9 x86_64
 Summary: The configuration files, libraries, and documentation for OpenLDAP.
 Name: openldap
-Version: 2.1.25
-Release: 5.1
+Version: 2.1.29
+Release: 1
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -29,7 +29,6 @@ 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.25-or.patch
 Patch12: db-4.0.14-disable-mutex.patch
 Patch13: db-4.0.14-libobjs.patch
 Patch21: MigrationTools-38-instdir.patch
@@ -38,6 +37,7 @@ Patch23: MigrationTools-27-simple.patch
 Patch24: MigrationTools-26-suffix.patch
 Patch25: MigrationTools-44-schema.patch
 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
@@ -103,7 +103,6 @@ programs needed for accessing and modifying OpenLDAP directories.
 %patch3 -p1 -b .syslog
 %patch4 -p1 -b .ldaprc
 %patch5 -p1 -b .susesec
-%patch6 -p1 -b .or
 
 pushd db-%{db_version_40}
 %patch12 -p1 -b .disable-mutex
@@ -113,7 +112,8 @@ cd dist
 popd
 
 pushd db-%{db_version}
-%patch30 -b .db
+%patch30 -b .db-1
+%patch31 -b .db-2
 popd
 
 pushd MigrationTools-%{migtools_version}
@@ -312,8 +312,7 @@ build \
 	--enable-rewrite \
 	--disable-shared \
 	--with-kerberos=k5only \
-	--with-cyrus-sasl \
-	--enable-kpasswd
+	--with-cyrus-sasl
 popd
 
 # Build clients without Kerberos password-checking support, which is only
@@ -530,10 +529,20 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
-* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+* Wed Apr 14 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.29-1
+- rebuild
+
+* Tue Apr  6 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.29-0
+- update to 2.1.29 (stable 20040329)
+
+* Mon Mar 29 2004 Nalin Dahyabhai <nalin@redhat.com>
+- don't build servers with --with-kpasswd, that option hasn't been recognized
+  since 2.1.23
+
+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com> 2.1.25-5.1
 - rebuilt
 
-* Mon Feb 23 2004 Tim Waugh <twaugh@redhat.com>
+* Mon Feb 23 2004 Tim Waugh <twaugh@redhat.com> 2.1.25-5
 - Use ':' instead of '.' as separator for chown.
 
 * Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
diff --git a/sources b/sources
index e96810d..9073d8e 100644
--- a/sources
+++ b/sources
@@ -4,4 +4,4 @@
 12262c64fcd64b772e7cffad8e4d0ebc  db-4.0.14.tar.gz
 cbc77517c9278cdb47613ce8cb55779f  db-4.2.52.tar.gz
 a1e6508c471dd47205a3492cf57110a6  openldap-2.0.27.tgz
-7e3e53a44230bedd66152f4bdb08f50b  openldap-2.1.25.tgz
+94de77f0efedeaacb2a78aab919aafbd  openldap-2.1.29.tgz