diff -ruN openldap24-server.old/Makefile openldap24-server/Makefile
--- openldap24-server.old/Makefile	2018-01-26 21:52:57.442254000 -0500
+++ openldap24-server/Makefile	2018-01-26 21:54:44.828316000 -0500
@@ -86,6 +86,7 @@
 OPTIONS_DEFINE+=	OUTLOOK
 OPTIONS_DEFINE+=	LASTBIND
 OPTIONS_DEFINE+=	KQUEUE
+OPTIONS_DEFINE+=	AUTOGROUP
 
 OPTIONS_DEFAULT=	MDB SYNCPROV DYNAMIC_BACKENDS
 
@@ -132,6 +133,7 @@
 OUTLOOK_DESC=		Force caseIgnoreOrderingMatch on name attribute (experimental)
 LASTBIND_DESC=		With lastbind overlay
 KQUEUE_DESC=		With kqueue support (experimental)
+AUTOGROUP_DESC=	With autogroup overlay
 .endif
 
 .if defined(CLIENT_ONLY)
@@ -475,6 +477,12 @@
 PLIST_SUB+=		LASTBIND="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MAUTOGROUP}
+PLIST_SUB+=		AUTOGROUP=""
+.else
+PLIST_SUB+=		AUTOGROUP="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MRLOOKUPS}
 CONFIGURE_ARGS+=	--enable-rlookups
 PLIST_SUB+=		RLOOKUPS=""
@@ -591,6 +599,11 @@
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
 		${MAKE_ARGS} prefix="${PREFIX}" all)
 .endif
+.if ${PORT_OPTIONS:MAUTOGROUP}
+	@(cd ${BUILD_WRKSRC}/contrib/slapd-modules/autogroup && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+		${MAKE_ARGS} prefix="${PREFIX}" all)
+.endif
 .endif
 
 pre-install:
@@ -633,6 +646,12 @@
 		${MAKE_ARGS} prefix="${PREFIX}" install)
 	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/lastbind.a
 .endif
+.if ${PORT_OPTIONS:MAUTOGROUP}
+	(cd ${WRKSRC}/contrib/slapd-modules/autogroup && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+		${MAKE_ARGS} prefix="${PREFIX}" install)
+	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/autogroup.a
+.endif
 .if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSMBPWD} || ${PORT_OPTIONS:MSHA2}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so
 .endif
diff -ruN openldap24-server.old/pkg-plist openldap24-server/pkg-plist
--- openldap24-server.old/pkg-plist	2018-01-26 21:52:57.449330000 -0500
+++ openldap24-server/pkg-plist	2018-01-26 21:53:55.484892000 -0500
@@ -101,6 +101,10 @@
 %%LASTBIND%%libexec/openldap/lastbind.so
 %%LASTBIND%%libexec/openldap/lastbind.so.0
 %%LASTBIND%%libexec/openldap/lastbind.so.0.0.0
+%%AUTOGROUP%%libexec/openldap/autogroup.la
+%%AUTOGROUP%%libexec/openldap/autogroup.so
+%%AUTOGROUP%%libexec/openldap/autogroup.so.0
+%%AUTOGROUP%%libexec/openldap/autogroup.so.0.0.0
 libexec/slapd
 man/man5/slapd-bdb.5.gz
 man/man5/slapd-config.5.gz