diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index a00d2a21ee7..13493290a64 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.71 2006/11/20 13:07:19 espie Exp $
+# $OpenBSD: Makefile,v 1.72 2006/11/25 16:50:24 espie Exp $
 
-COMMENT=	"Open source LDAP software (client)"
+COMMENT-main=	"Open source LDAP software (client)"
 COMMENT-server=	"Open source LDAP software (server)"
 
-DISTNAME=	openldap-2.3.27
-FULLPKGNAME=	${DISTNAME:S/-/-client-/}p0
-PKGNAME-server=	${DISTNAME:S/-/-server-/}p0
+V=		2.3.27
+DISTNAME=	openldap-$V
+FULLPKGNAME-main=openldap-client-$Vp1
+PKGNAME-server=	openldap-server-$Vp1
 SHARED_LIBS +=	lber                 9.1      # .2.15
 SHARED_LIBS +=	ldap                 9.1      # .2.15
 SHARED_LIBS +=	ldap_r               9.1      # .2.15
@@ -70,8 +71,7 @@ REGRESS_TARGET=	test
 FLAVORS=	bdb
 FLAVOR?=
 
-MULTI_PACKAGES=	-server
-SUBPACKAGE?=
+MULTI_PACKAGES=	-main -server
 
 LIB_DEPENDS+=		sasl2::security/cyrus-sasl2
 CPPFLAGS+=		-I${LOCALBASE}/include/sasl
@@ -90,10 +90,11 @@ CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" \
 			LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
 			LIBS="${LIBS}"
 
-.if ${SUBPACKAGE} == "-server"
-RUN_DEPENDS=	:${FULLPKGNAME}:databases/openldap
-WANTLIB+=	perl util wrap m pthread
-.endif
+RUN_DEPENDS-server=	:${FULLPKGNAME-main}:databases/openldap
+WANTLIB-server=		${WANTLIB} perl util wrap m pthread
+
+BASE_PKGPATH=	${PKGPATH}${FLAVOR_EXT:S/-/,/g}
+SUBST_VARS=	BASE_PKGPATH
 
 USE_LIBTOOL=	Yes
 
diff --git a/databases/openldap/pkg/DESCR b/databases/openldap/pkg/DESCR-main
similarity index 100%
rename from databases/openldap/pkg/DESCR
rename to databases/openldap/pkg/DESCR-main
diff --git a/databases/openldap/pkg/PFRAG.shared b/databases/openldap/pkg/PFRAG.shared-main
similarity index 78%
rename from databases/openldap/pkg/PFRAG.shared
rename to databases/openldap/pkg/PFRAG.shared-main
index 5f2f1cef6a3..a4198df3ae8 100644
--- a/databases/openldap/pkg/PFRAG.shared
+++ b/databases/openldap/pkg/PFRAG.shared-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.30 2005/12/29 14:00:36 bernd Exp $
+@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/25 16:50:24 espie Exp $
 @lib lib/liblber-2.3.so.${LIBlber-2.3_VERSION}
 @lib lib/liblber.so.${LIBlber_VERSION}
 @lib lib/libldap-2.3.so.${LIBldap-2.3_VERSION}
diff --git a/databases/openldap/pkg/PLIST b/databases/openldap/pkg/PLIST-main
similarity index 98%
rename from databases/openldap/pkg/PLIST
rename to databases/openldap/pkg/PLIST-main
index 7b071f2321d..70268e42547 100644
--- a/databases/openldap/pkg/PLIST
+++ b/databases/openldap/pkg/PLIST-main
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.15 2006/02/28 16:27:53 bernd Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2006/11/25 16:50:24 espie Exp $
+@pkgpath ${BASE_PKGPATH}
 bin/ldapadd
 bin/ldapcompare
 bin/ldapdelete