diff -Nru net/openldap24-server.orig/Makefile net/openldap24-server/Makefile
--- net/openldap24-server.orig/Makefile	2019-10-24 16:00:31.319269000 +0200
+++ net/openldap24-server/Makefile	2019-10-24 16:33:58.117469000 +0200
@@ -85,6 +85,7 @@
 OPTIONS_DEFINE+=	REFINT RETCODE RWM SEQMOD SSSVLV SYNCPROV TRANSLUCENT
 OPTIONS_DEFINE+=	UNIQUE VALSORT SMBPWD SHA2 DYNAMIC_BACKENDS SASL
 OPTIONS_DEFINE+=	LMPASSWD
+OPTIONS_DEFINE+=	PBKDF2
 OPTIONS_DEFINE+=	OUTLOOK
 OPTIONS_DEFINE+=	LASTBIND
 OPTIONS_DEFINE+=	KQUEUE
@@ -130,6 +131,7 @@
 SMBPWD_DESC=		With Samba Password hashes overlay
 SHA2_DESC=		With SHA2 Password hashes overlay
 LMPASSWD_DESC=		With LM hash password support (DEPRECATED)
+PBKDF2_DESC=		With PBKDF2 hash password support
 DYNAMIC_BACKENDS_DESC=	Build dynamic backends
 OUTLOOK_DESC=		Force caseIgnoreOrderingMatch on name attribute (experimental)
 LASTBIND_DESC=		With lastbind overlay
@@ -467,6 +469,13 @@
 PLIST_SUB+=		SHA2="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MPBKDF2}
+PLIST_SUB+=		PBKDF2=""
+.else
+PLIST_SUB+=		PBKDF2="@comment "
+.endif
+
+
 .if ${PORT_OPTIONS:MLASTBIND}
 PLIST_SUB+=		LASTBIND=""
 .else
@@ -580,6 +589,12 @@
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
 		${MAKE_ARGS} prefix="${PREFIX}" all)
 .endif
+.if ${PORT_OPTIONS:MPBKDF2}
+	@(cd ${BUILD_WRKSRC}/contrib/slapd-modules/passwd/pbkdf2 && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+		${MAKE_ARGS} prefix="${PREFIX}" all)
+.endif
+
 .if ${PORT_OPTIONS:MLASTBIND}
 	@(cd ${BUILD_WRKSRC}/contrib/slapd-modules/lastbind && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
@@ -621,13 +636,20 @@
 		${MAKE_ARGS} prefix="${PREFIX}" install)
 	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/pw-sha2.a
 .endif
+.if ${PORT_OPTIONS:MPBKDF2}
+	(cd ${WRKSRC}/contrib/slapd-modules/passwd/pbkdf2 && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+		${MAKE_ARGS} prefix="${PREFIX}" install)
+	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/pw-pbkdf2.a
+.endif
+
 .if ${PORT_OPTIONS:MLASTBIND}
 	(cd ${WRKSRC}/contrib/slapd-modules/lastbind && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
 		${MAKE_ARGS} prefix="${PREFIX}" install)
 	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/lastbind.a
 .endif
-.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSMBPWD} || ${PORT_OPTIONS:MSHA2}
+.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSMBPWD} || ${PORT_OPTIONS:MSHA2} || ${PORT_OPTIONS:MPBKDF2}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so
 .endif
 .if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSLAPI}
diff -Nru net/openldap24-server.orig/pkg-plist net/openldap24-server/pkg-plist
--- net/openldap24-server.orig/pkg-plist	2017-10-30 06:53:38.000000000 +0100
+++ net/openldap24-server/pkg-plist	2019-10-24 16:22:33.421283000 +0200
@@ -93,6 +93,10 @@
 %%SHA2%%libexec/openldap/pw-sha2.so
 %%SHA2%%libexec/openldap/pw-sha2.so.0
 %%SHA2%%libexec/openldap/pw-sha2.so.0.0.0
+%%PBKDF2%%libexec/openldap/pw-pbkdf2.la
+%%PBKDF2%%libexec/openldap/pw-pbkdf2.so
+%%PBKDF2%%libexec/openldap/pw-pbkdf2.so.0
+%%PBKDF2%%libexec/openldap/pw-pbkdf2.so.0.0.0
 %%SMBPWD%%libexec/openldap/smbk5pwd.la
 %%SMBPWD%%libexec/openldap/smbk5pwd.so
 %%SMBPWD%%libexec/openldap/smbk5pwd.so.0