diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 26e8f46664e..486610eed5d 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.52 2005/06/15 20:23:10 jakob Exp $
+# $OpenBSD: Makefile,v 1.53 2005/06/29 13:25:19 msf Exp $
 
 COMMENT=	"Open source LDAP software (client)"
 COMMENT-server=	"Open source LDAP software (server)"
 
 VERSION=	2.2.27
 DISTNAME=	openldap-${VERSION}
-FULLPKGNAME=	openldap-client-${VERSION}
-PKGNAME-server=	openldap-server-${VERSION}
+FULLPKGNAME=	openldap-client-${VERSION}p0
+PKGNAME-server=	openldap-server-${VERSION}p0
 CATEGORIES=	databases net
 
 HOMEPAGE=	http://www.openldap.org/
diff --git a/databases/openldap/pkg/PLIST b/databases/openldap/pkg/PLIST
index 57c89c3562c..e2fc9f7cc9e 100644
--- a/databases/openldap/pkg/PLIST
+++ b/databases/openldap/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.11 2004/11/08 20:27:34 biorn Exp $
+@comment $OpenBSD: PLIST,v 1.12 2005/06/29 13:25:19 msf Exp $
 bin/ldapadd
 bin/ldapcompare
 bin/ldapdelete
@@ -183,5 +183,7 @@ lib/libldap_r.la
 @man man/man5/ldap.conf.5
 @man man/man5/ldif.5
 share/examples/openldap/
+@sample ${SYSCONFDIR}/openldap/
 share/examples/openldap/ldap.conf
+@sample ${SYSCONFDIR}/openldap/ldap.conf
 %%SHARED%%
diff --git a/databases/openldap/pkg/PLIST-server b/databases/openldap/pkg/PLIST-server
index 51b006aef23..3c6b7d5b0d9 100644
--- a/databases/openldap/pkg/PLIST-server
+++ b/databases/openldap/pkg/PLIST-server
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-server,v 1.9 2005/05/02 12:19:51 jakob Exp $
+@comment $OpenBSD: PLIST-server,v 1.10 2005/06/29 13:25:19 msf Exp $
 @newgroup _openldap:544
 @newuser _openldap:544:_openldap:daemon:OpenLDAP Account:/nonexistent:/sbin/nologin
 libexec/slapd
@@ -35,16 +35,27 @@ sbin/slapindex
 sbin/slappasswd
 sbin/slaptest
 share/examples/openldap/schema/
+@sample ${SYSCONFDIR}/openldap/schema/
 share/examples/openldap/schema/corba.schema
+@sample ${SYSCONFDIR}/openldap/schema/corba.schema
 share/examples/openldap/schema/core.schema
+@sample ${SYSCONFDIR}/openldap/schema/core.schema
 share/examples/openldap/schema/cosine.schema
+@sample ${SYSCONFDIR}/openldap/schema/cosine.schema
 share/examples/openldap/schema/dyngroup.schema
+@sample ${SYSCONFDIR}/openldap/schema/dyngroup.schema
 share/examples/openldap/schema/inetorgperson.schema
+@sample ${SYSCONFDIR}/openldap/schema/inetorgperson.schema
 share/examples/openldap/schema/java.schema
+@sample ${SYSCONFDIR}/openldap/schema/java.schema
 share/examples/openldap/schema/misc.schema
+@sample ${SYSCONFDIR}/openldap/schema/misc.schema
 share/examples/openldap/schema/nis.schema
+@sample ${SYSCONFDIR}/openldap/schema/nis.schema
 share/examples/openldap/schema/openldap.schema
+@sample ${SYSCONFDIR}/openldap/schema/openldap.schema
 share/examples/openldap/slapd.conf
+@sample ${SYSCONFDIR}/openldap/slapd.conf
 share/openldap/
 share/openldap/ucdata/
 share/openldap/ucdata/case.dat