diff --git a/srcpkgs/openldap/INSTALL b/srcpkgs/openldap/INSTALL
index 6d85e7d9412..386d43a6454 100644
--- a/srcpkgs/openldap/INSTALL
+++ b/srcpkgs/openldap/INSTALL
@@ -1,10 +1,7 @@
 # INSTALL
-
 case "$ACTION" in
 post)
-	if [ "$UPDATE" = "no" ]; then
-		chown ldap:ldap /etc/openldap/slapd.conf
-		chown -R ldap:ldap /var/lib/openldap
-	fi
+	chown ldap:ldap etc/openldap/slapd.conf
+	chown -R ldap:ldap var/lib/openldap
 	;;
 esac
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 1fca0619cb2..b358f426bad 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'libldap'
 pkgname=openldap
 version=2.4.42
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -15,7 +15,7 @@ configure_args="--prefix=/usr
  --disable-static --with-yielding_select=yes"
 hostmakedepends="pkg-config groff automake libtool"
 makedepends="libressl-devel libsasl-devel db-devel"
-conf_files="/etc/openldap/ldap.conf" 
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
 license="OpenLDAP License v2.8 - BSD alike"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
@@ -26,7 +26,6 @@ checksum=eeb7b0e2c5852bfd2650e83909bb6152835c0b862fab10b63954dc1bcbba8e63
 build_pie=yes
 system_accounts="ldap"
 ldap_homedir="/var/lib/openldap"
-make_dirs="/var/lib/openldap 0755 ldap ldap"
 
 pre_configure() {
 	sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h
@@ -39,6 +38,8 @@ post_install() {
 	vsv slapd
 	vlicense LICENSE
 	chmod 755 ${DESTDIR}/usr/lib/*.so.*
+	vmkdir usr/share/examples/openldap
+	mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
 }