diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index ce1603f56..f59f16e8b 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,7 +1,7 @@
 COMMENT-main =	  LDAP client library and tools
 COMMENT-server =  LDAP directory server
 
-DISTNAME =	  openldap-2.6.7
+DISTNAME =	  openldap-2.6.8
 
 MULTI_PACKAGES =  -main -server
 PKGNAME-main =	  ${DISTNAME:S/-/-client-/}
@@ -35,7 +35,7 @@ COMPILER =		base-clang ports-gcc
 DPB_PROPERTIES =	parallel
 DEBUG_PACKAGES =	${BUILD_PACKAGES}
 
-AUTOCONF_VERSION =	2.69
+AUTOCONF_VERSION =	2.71
 CONFIGURE_STYLE =	autoconf
 MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC} ${WRKSRC}/build
 USE_GMAKE =		Yes
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index af77aa4cf..5bd4f368e 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openldap-2.6.7.tgz) = zXdfYlyUTteKPaGKA7A7CO6nPIqryXtBuzNumhCVSTA=
-SIZE (openldap-2.6.7.tgz) = 6484944
+SHA256 (openldap-2.6.8.tgz) = SJaTI+lOO+OwPGoTKULcun741UXyrTVAFwkBn2lsPE4=
+SIZE (openldap-2.6.8.tgz) = 6512544
diff --git a/databases/openldap/patches/patch-configure_ac b/databases/openldap/patches/patch-configure_ac
index a05359a72..c1a9baef9 100644
--- a/databases/openldap/patches/patch-configure_ac
+++ b/databases/openldap/patches/patch-configure_ac
@@ -7,7 +7,7 @@ Patch to use it, avoiding the need for Linux/libext2fs libuuid.
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
-@@ -1076,11 +1076,11 @@ dnl --------------------------------------------------
+@@ -1093,11 +1093,11 @@ dnl --------------------------------------------------
  dnl UUID Support
  
  have_uuid=no
diff --git a/databases/openldap/pkg/PLIST-server b/databases/openldap/pkg/PLIST-server
index 2bb430e4a..fdfcff9c9 100644
--- a/databases/openldap/pkg/PLIST-server
+++ b/databases/openldap/pkg/PLIST-server
@@ -47,6 +47,8 @@ libexec/openldap/homedir.la
 @so libexec/openldap/homedir.so
 libexec/openldap/memberof.la
 @so libexec/openldap/memberof.so
+libexec/openldap/nestgroup.la
+@so libexec/openldap/nestgroup.so
 libexec/openldap/otp.la
 @so libexec/openldap/otp.so
 libexec/openldap/pcache.la
@@ -108,6 +110,7 @@ libexec/openldap/valsort.la
 @man man/man5/slapo-dynlist.5
 @man man/man5/slapo-homedir.5
 @man man/man5/slapo-memberof.5
+@man man/man5/slapo-nestgroup.5
 @man man/man5/slapo-otp.5
 @man man/man5/slapo-pbind.5
 @man man/man5/slapo-pcache.5