diff --git a/CHANGES b/CHANGES
index ecb7d8567e2feb20d24eb13bece5ca0e8a901663..0f97e978fb4c86dcf544c00c912d50e40ddcfb8e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -121,9 +121,11 @@ OpenLDAP 2.4.24 Engineering
 		admin24 guide refint rootdn requirement (ITS#6364)
 		admin24 add pcache overlay section (ITS#6521)
 		ldap_open(3) document ldap_set_urllist_proc (ITS#6601)
-		ldap.conf(5) GNUTls cipher spec info (ITS#6525)
-		slapd.conf(5) GNUTls cipher spec info (ITS#6525)
-		slapd-config(5) GNUTls cipher spec info (ITS#6525)
+		ldap.conf(5) GnuTLS cipher spec info (ITS#6525)
+		slapd.conf(5) GnlTLS cipher spec info (ITS#6525)
+		slapd.conf(5) multi-listener support (ITS#6780)
+		slapd-config(5) GnuTLS cipher spec info (ITS#6525)
+		slapd-config(5) multi-listener support (ITS#6780)
 		slapo-pcache(5) note rootdn requirement (ITS#6522)
 		slapo-refint(5) rootdn requirement (ITS#6364)
 
diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5
index 5f059816292bf1582d58bfe36c1d358c0a3562eb..23ff1e9a072081e961d6f950432b82a9de27d3e1 100644
--- a/doc/man/man5/slapd-config.5
+++ b/doc/man/man5/slapd-config.5
@@ -508,6 +508,11 @@ changing these settings will generally require deleting any indices that
 depend on these parameters and recreating them with
 .BR slapindex (8).
 
+.TP
+.B olcListenerThreads: <integer>
+Specify the number of threads to use for the connection manager.
+The default is 1 and this is typically adequate for up to 16 CPU cores.
+The value should be set to a power of 2.
 .TP
 .B olcLocalSSF: <SSF>
 Specifies the Security Strength Factor (SSF) to be given local LDAP sessions,
diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 15ef8a4b28dd7adc202b070fb49043b2e13349f7..e026815f3c81ad8f0d3e43cdd87dbca6e8f07fa4 100644
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -564,6 +564,11 @@ is used, this configuration statement would result in an error,
 since no handlers would be associated to the resulting syntax structure.
 .RE
 
+.TP
+.B listener-threads <integer>
+Specify the number of threads to use for the connection manager.
+The default is 1 and this is typically adequate for up to 16 CPU cores.
+The value should be set to a power of 2.
 .TP
 .B localSSF <SSF>
 Specifies the Security Strength Factor (SSF) to be given local LDAP sessions,