diff --git a/databases/openldap-client/Makefile b/databases/openldap-client/Makefile
index f83dba79aa21..2c894d0c7380 100644
--- a/databases/openldap-client/Makefile
+++ b/databases/openldap-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/31 18:18:34 ghen Exp $
+# $NetBSD: Makefile,v 1.2 2006/06/02 22:02:33 joerg Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
 COMMENT=		Lightweight Directory Access Protocol libraries and client programs
@@ -16,5 +16,7 @@ BUILD_DEFS+=		OPENLDAP_ETCDIR
 
 CNFS=			ldap.conf
 
+.include "options.mk"
+
 .include "../../databases/openldap/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile
index bf89d3cca52b..28aa622149fe 100644
--- a/databases/openldap-server/Makefile
+++ b/databases/openldap-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/31 18:18:36 ghen Exp $
+# $NetBSD: Makefile,v 1.2 2006/06/02 22:02:33 joerg Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 COMMENT=		Lightweight Directory Access Protocol server suite
@@ -70,6 +70,8 @@ MESSAGE_SUBST+=		OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q}
 MESSAGE_SUBST+=		CHOWN=${CHOWN}
 MESSAGE_SUBST+=		CHMOD=${CHMOD}
 
+.include "options.mk"
+
 .include "../../databases/openldap/Makefile.common"
 
 CONF_FILES_PERMS+=	${EGDIR}/DB_CONFIG ${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG ${OPENLDAP_FILEPERMS}
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
index 7a8bb7be9be0..245c3b6ac71e 100644
--- a/databases/openldap/Makefile.common
+++ b/databases/openldap/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2006/05/31 18:17:49 ghen Exp $
+# $NetBSD: Makefile.common,v 1.2 2006/06/02 22:02:33 joerg Exp $
 
 DISTNAME=		openldap-2.3.23
 CATEGORIES=		databases
@@ -31,8 +31,6 @@ SLAPD_USER?=		slapd
 SLURPD_USER?=		slurpd
 LDAP_GROUP?=		ldap
 
-.include "${.CURDIR}/options.mk"
-
 # the internal avl_* prototypes conflict with those in <sys/avl.h> which
 # is included by another system header file on Solaris, so subst them.
 .if ${OPSYS} == "SunOS"