diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD
index 1094c969090c5e612b7ebe254d660703cad59e8a..4bc8e629adfc599bb17c61dd7266d38c9219b276 100644
--- a/main/openldap/APKBUILD
+++ b/main/openldap/APKBUILD
@@ -103,6 +103,8 @@ package() {
 
 	cd "$pkgdir"
 
+	rmdir var/lib/openldap/run
+
 	# Fix tools symlinks to slapd.
 	local path; for path in $(find usr/sbin/ -type l); do
 		ln -sf slapd $path
@@ -111,6 +113,10 @@ package() {
 	# Move executable from lib to sbin.
 	mv usr/lib/slapd usr/sbin/
 
+	# Move *.default configs to docs.
+	mkdir -p usr/share/doc/$pkgname
+	mv etc/openldap/*.default usr/share/doc/$pkgname/
+
 	sed -i -e 's:/var/lib/openldap/run:/run/openldap:g' \
 		-e 's:back_bdb.la:back_bdb.so:' \
 		-e 's:back_hdb.la:back_hdb.so:' \