diff --git a/CHANGES b/CHANGES
index 604b8506ca49d33cd66b8f656bfa9eb465325feb..8734e9bd89f7551f72cb5446139ba6645a4f4ce6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -51,6 +51,7 @@ OpenLDAP 2.4.17 Engineering
 		slapd-config(5) pidfile/argsfile description fix (ITS#5975)
 		slapo-constraint(5) clarify URI example (ITS#6118)
 		slapo-unique(5) explicitly note rootdn requirement (ITS#6108)
+		slapadd(8) note it does indexing (ITS#6160)
 
 OpenLDAP 2.4.16 Release (2009/04/05)
 	Fixed libldap GnuTLS with x509v1 CA certs (ITS#5992)
diff --git a/doc/man/man8/slapadd.8 b/doc/man/man8/slapadd.8
index f92cdf9d97ccd3a9732e73341ec664d2f80b6c30..4261c1ea8eacd9336660649a7c9c00136e1a2b73 100644
--- a/doc/man/man8/slapadd.8
+++ b/doc/man/man8/slapadd.8
@@ -67,6 +67,10 @@ in
 .BR slapd (8)),
 or change file ownership before running
 .BR slapd (8).
+
+Note: slapadd will also perform the relevant indexing whilst adding the database if
+any are configured. For specfic details, please see 
+.BR slapindex (8).
 .SH OPTIONS
 .TP
 .BI \-b \ suffix 
@@ -198,6 +202,7 @@ database give the command:
 .BR ldap (3),
 .BR ldif (5),
 .BR slapcat (8),
+.BR slapindex (8),
 .BR ldapadd (1),
 .BR slapd (8)
 .LP