diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index e69bc9db0b8..314d0e55a12 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.187 2021/06/09 22:31:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.188 2021/07/28 07:23:34 landry Exp $
 
 DPB_PROPERTIES =	parallel
 
@@ -11,6 +11,7 @@ PORTROACH =		limit:^2\.4\.
 DISTNAME =		openldap-2.4.59
 PKGNAME-main =		${DISTNAME:S/-/-client-/}
 PKGNAME-server =	${DISTNAME:S/-/-server-/}
+REVISION-server =	0
 
 # overwrite -main pkgname/path to strip FLAVOR, aci only affects the server
 FULLPKGNAME-main =	${DISTNAME:S/-/-client-/}${FLAVOR_EXT:S/-aci//}
diff --git a/databases/openldap/pkg/PLIST-server b/databases/openldap/pkg/PLIST-server
index f04930323a5..8fcf27aa44d 100644
--- a/databases/openldap/pkg/PLIST-server
+++ b/databases/openldap/pkg/PLIST-server
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-server,v 1.27 2020/06/18 17:42:56 sthen Exp $
+@comment $OpenBSD: PLIST-server,v 1.28 2021/07/28 07:23:34 landry Exp $
 @option is-branch
 @conflict openldap-client-<=2.4.45p0
 @pkgpath databases/openldap,-server,bdb
@@ -72,9 +72,11 @@ sbin/slappasswd
 sbin/slapschema
 sbin/slaptest
 share/examples/openldap/DB_CONFIG.example
-@mode 600
 @owner _openldap
 @group _openldap
+@mode 700
+@sample /var/openldap-data/
+@mode 600
 @sample /var/openldap-data/DB_CONFIG
 @mode
 @owner
@@ -127,7 +129,3 @@ share/examples/openldap/slapd.ldif
 @mode 0750
 @group _openldap
 @sample ${SYSCONFDIR}/openldap/slapd.d/
-@mode 700
-@owner _openldap
-@group
-@sample /var/openldap-data/