diff --git a/common/shlibs b/common/shlibs
index d2791c238ea..c9d59ef3b97 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -698,9 +698,8 @@ libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
 libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
 libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
 libsasl2.so.3 libsasl-2.1.26_1
-liblber-2.4.so.2 libldap-2.4.21_1
-libldap-2.4.so.2 libldap-2.4.21_1
-libldap_r-2.4.so.2 libldap-2.4.21_1
+liblber.so.2 libldap-2.6.3_1
+libldap.so.2 libldap-2.6.3_1
 libevent-2.1.so.7 libevent-2.1.11_1
 libevent_core-2.1.so.7 libevent-2.1.11_1
 libevent_extra-2.1.so.7 libevent-2.1.11_1
diff --git a/srcpkgs/openldap/files/slapd/run b/srcpkgs/openldap/files/slapd/run
index f7addfcbeea..4fa2253b182 100644
--- a/srcpkgs/openldap/files/slapd/run
+++ b/srcpkgs/openldap/files/slapd/run
@@ -7,4 +7,4 @@ if [ ! -d /run/openldap ]; then
 	chown $LDAPUSER:$LDAPGROUP /run/openldap
 fi
 exec 2>&1
-exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0
+exec slapd -u $LDAPUSER -g $LDAPGROUP -d 0 ${LDAPURLS:+-h "$LDAPURLS"} $LDAPOPTS
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 2118b544210..d10daef834a 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,28 +1,28 @@
 # Template file for 'openldap'
 pkgname=openldap
-version=2.4.58
-revision=2
+version=2.6.6
+revision=1
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
  --sysconfdir=/etc
  --localstatedir=/var/lib/openldap
  --sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls --enable-ldap
+ --enable-dynamic --with-tls --enable-ldap
  --enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
  --enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
+ --enable-overlays=yes --enable-meta=yes
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff"
 makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
-conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
+conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="OLDAP-2.0"
 homepage="http://www.openldap.org"
 distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+checksum=082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0
 
 system_accounts="ldap"
 ldap_homedir="/var/lib/openldap"
@@ -32,13 +32,18 @@ pre_configure() {
 	sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
 	sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
 }
+
+pre_build() {
+	make ${makejobs} ${make_build_args} depend
+}
+
 post_install() {
 	ln -sf ../libexec/slapd ${DESTDIR}/usr/bin/slapd
 	vsv slapd
 	vlicense LICENSE
 	chmod 755 ${DESTDIR}/usr/lib/*.so.*
 	vmkdir usr/share/examples/openldap
-	mv ${DESTDIR}/etc/openldap/*.{example,default} ${DESTDIR}/usr/share/examples/openldap
+	mv ${DESTDIR}/etc/openldap/*.default ${DESTDIR}/usr/share/examples/openldap
 	chmod 0644 ${DESTDIR}/usr/share/examples/openldap/*
 }
 
@@ -72,6 +77,7 @@ openldap-tools_package() {
 		vmove usr/bin/ldapwhoami
 		vmove usr/bin/ldapdelete
 		vmove usr/bin/ldapadd
+		vmove usr/bin/ldapvc
 		vmove usr/share/man/man1/ldapmodrdn.1
 		vmove usr/share/man/man1/ldapsearch.1
 		vmove usr/share/man/man1/ldapcompare.1
@@ -82,5 +88,6 @@ openldap-tools_package() {
 		vmove usr/share/man/man1/ldapwhoami.1
 		vmove usr/share/man/man1/ldapdelete.1
 		vmove usr/share/man/man1/ldapadd.1
+		vmove usr/share/man/man1/ldapvc.1
 	}
 }