diff --git a/ldap.init b/ldap.init
index 806a709..efba439 100644
--- a/ldap.init
+++ b/ldap.init
@@ -38,7 +38,7 @@ function start() {
 	ldapuid=`id -u $user`
 	# Unaccessible database files.
 	for dbdir in `grep ^directory /etc/openldap/slapd.conf | sed s,^directory,,` ; do
-		for file in `find ${dbdir}/ -not -uid $ldapuid -and -name "*.dbb" -or -name "*.gdbm" -or -name "*.bdb"` ; do
+		for file in `find ${dbdir}/ -not -uid $ldapuid -and \( -name "*.dbb" -or -name "*.gdbm" -or -name "*.bdb" \)` ; do
 			echo -n $"$file is not owned by \"$user\"" ; warning ; echo
 		done
 	done
@@ -104,16 +104,6 @@ case "$1" in
 	stop
 	start
 	;;
-    reload)
-    	killproc ${slapd} -HUP
-	RETVAL=$?
-	if [ $RETVAL -eq 0 ]; then
-	    if grep -q "^replogfile" /etc/openldap/slapd.conf; then
-		killproc ${slurpd} -HUP
-		RETVAL=$?
-	    fi
-	fi
-	;;
     condrestart)
         if [ -f /var/lock/subsys/ldap ] ; then
             stop
diff --git a/openldap.spec b/openldap.spec
index d78b177..13c29f9 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.25
-Release: 1
+Release: 5.1
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -37,6 +37,7 @@ Patch22: MigrationTools-36-mktemp.patch
 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
 URL: http://www.openldap.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPreReq: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5, krb5-devel
@@ -111,6 +112,10 @@ cd dist
 ./s_config
 popd
 
+pushd db-%{db_version}
+%patch30 -b .db
+popd
+
 pushd MigrationTools-%{migtools_version}
 %patch21 -p1 -b .instdir
 %patch22 -p1 -b .mktemp
@@ -435,7 +440,7 @@ if /usr/sbin/useradd -c "LDAP User" -u 55 \
 	if [ -d /var/lib/ldap ] ; then
 		for dbfile in /var/lib/ldap/* ; do
 			if [ -f $dbfile ] ; then
-				chown ldap.ldap $dbfile
+				chown ldap:ldap $dbfile
 			fi
 		done
 	fi
@@ -457,7 +462,7 @@ SomeOrganizationalUnit
 localhost.localdomain
 root@localhost.localdomain
 EOF
-chown root.ldap slapd.pem
+chown root:ldap slapd.pem
 chmod 640 slapd.pem
 popd
 fi
@@ -525,6 +530,28 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Mon Feb 23 2004 Tim Waugh <twaugh@redhat.com>
+- Use ':' instead of '.' as separator for chown.
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Feb 10 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.25-4
+- remove 'reload' from the init script -- it never worked as intended (#115310)
+
+* Wed Feb  4 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.25-3
+- commit that last fix correctly this time
+
+* Tue Feb  3 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.25-2
+- fix incorrect use of find when attempting to detect a common permissions
+  error in the init script (#114866)
+
+* Fri Jan 16 2004 Nalin Dahyabhai <nalin@redhat.com>
+- add bug fix patch for DB 4.2.52
+
 * Thu Jan  8 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.25-1
 - change logging facility used from daemon to local4 (#112730, reversing #11047)
   BEHAVIOR CHANGE - SHOULD BE MENTIONED IN THE RELEASE NOTES.