diff --git a/openldap.spec b/openldap.spec
index 9755a08..3636dce 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: 2.1
+Release: 3
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -546,7 +546,7 @@ fi
 # If there's a /var/lib/ldap/upgrade.ldif file, slapadd it and delete it.
 # It was created by the uninstall of the previous version.
 if [ -f /var/lib/ldap/upgrade.ldif ] ; then
-	/sbin/runuser -f -m -s /bin/sh -c "/usr/sbin/slapadd" -- "ldap" < /var/lib/ldap/upgrade.ldif
+	/sbin/runuser -m -s /usr/sbin/slapadd -- "ldap" -l /var/lib/ldap/upgrade.ldif
 	rm /var/lib/ldap/upgrade.ldif
 fi
 exec > /dev/null 2> /dev/null
@@ -576,9 +576,7 @@ fi
 # Save an ldif of the database where the "% post servers" scriptlet can
 # restore it.  Also save the database files to a "rpmorig" directory
 # Just In Case (TM)
-if slapcat -l /dev/null > /dev/null 2>&1 ; then
-	/sbin/service ldap stop > /dev/null 2>&1 || :
-	/usr/sbin/slapcat -l /var/lib/ldap/upgrade.ldif
+if /usr/sbin/slapcat -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1 ; then
 	rm -fr /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
 	mkdir /var/lib/ldap/rpmorig
 	mv /var/lib/ldap/{alock,*.bdb,__db.*,log.*} /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
@@ -684,6 +682,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Thu Feb 9 2006 Jay Fenlason <fenlason@redhat.com> 2.3.19-3
+- Modify the ldap.init script to call runuser correctly.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.3.19-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes