diff --git a/n/openldap/doinst.sh b/n/openldap/doinst.sh
index cbfdfb3a..2006f3a8 100644
--- a/n/openldap/doinst.sh
+++ b/n/openldap/doinst.sh
@@ -20,4 +20,4 @@ if ! grep ^ldap /etc/passwd > /dev/null ; then
     /usr/sbin/useradd -c OpenLDAP -d /var/lib/openldap-data -g ldap ldap
 fi
 
-chown -R ldap:ldap /var/lib/openldap-data /var/lib/openldap-slurp
+chown -R ldap:ldap /var/lib/openldap-data /var/lib/openldap-slurp /etc/openldap
diff --git a/n/openldap/openldap.SlackBuild b/n/openldap/openldap.SlackBuild
index fd726a21..bfd13ed7 100755
--- a/n/openldap/openldap.SlackBuild
+++ b/n/openldap/openldap.SlackBuild
@@ -109,7 +109,7 @@ rm $PKG/etc/openldap/ldap.conf.default
 rm $PKG/etc/openldap/slapd.conf.default
 mv $PKG/etc/openldap/ldap.conf $PKG/etc/openldap/ldap.conf.new
 mv $PKG/etc/openldap/slapd.conf $PKG/etc/openldap/slapd.conf.new
-sed -r -i 's|/var/lib/run/|/var/run/|' $PKG/etc/openldap/slapd.conf.new
+sed -ri 's|var/lib/run|var/lib/openldap-data|' $PKG/etc/openldap/slapd.conf.new
 
 # Strip binaries
 find $PKG | xargs file | grep "ELF 32-bit LSB" | cut -d : -f 1 | \
diff --git a/n/openldap/rc.openldap b/n/openldap/rc.openldap
index 433d83f0..6042065d 100644
--- a/n/openldap/rc.openldap
+++ b/n/openldap/rc.openldap
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PIDFILE=/var/run/slapd.pid
+PIDFILE=/var/lib/openldap-data/slapd.pid
 
 start()
 {
@@ -9,7 +9,7 @@ start()
 
 stop()
 {
-    [ -f /var/run/slapd.pid ] && kill -INT `cat /var/run/slapd.pid`
+    [ -f $PIDFILE ] && kill -INT `cat $PIDFILE`
 }
 
 case "$1" in