diff --git a/CHANGES b/CHANGES
index 47d011afacf82b64af6696aa2ab8e0bac6c10109..d0daf013e60a3d9620992b1fb634f3806eb7f779 100644
--- a/CHANGES
+++ b/CHANGES
@@ -64,6 +64,7 @@ OpenLDAP 2.4.14 Engineering
 		slapo-constraint(5) example fix (ITS#5895)
 		slap*(8) man pages should mention slapd-config (ITS#5828)
 		slapadd/cat/index(8) note -n 0 for slapd-config (ITS#5891)
+		Added SEE ALSO slapd-config(5) to relevant man pages (ITS#5914)
 
 OpenLDAP 2.4.13 Release (2008/11/24)
 	Added libldap dereference control support (ITS#5768)
diff --git a/doc/man/man5/slapd-bdb.5 b/doc/man/man5/slapd-bdb.5
index 677747f0dc2e8e70746cdeb5728892d938a983d8..94aaece6e812f8a427a7593659e79077457f2335 100644
--- a/doc/man/man5/slapd-bdb.5
+++ b/doc/man/man5/slapd-bdb.5
@@ -266,6 +266,7 @@ configuration file
 Berkeley DB configuration file
 .SH SEE ALSO
 .BR slapd.conf (5),
+.BR slapd\-config (5),
 .BR slapd (8),
 .BR slapadd (8),
 .BR slapcat (8),
diff --git a/doc/man/man5/slapd-ldap.5 b/doc/man/man5/slapd-ldap.5
index 65b1180279161604793c73dc3899abc75f356821..44e9f7e1969afe19a0fc0847a77d35378e71cfa3 100644
--- a/doc/man/man5/slapd-ldap.5
+++ b/doc/man/man5/slapd-ldap.5
@@ -709,6 +709,7 @@ ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
 .BR slapd.conf (5),
+.BR slapd\-config (5),
 .BR slapd\-meta (5),
 .BR slapo\-chain (5),
 .BR slapo\-pcache (5),
diff --git a/doc/man/man5/slapd-ldif.5 b/doc/man/man5/slapd-ldif.5
index fee29b7ab7129536e40227baa86d758b40d6305f..2a5be8ad32b4e5894873bf0c91c46d37a2f2b8f5 100644
--- a/doc/man/man5/slapd-ldif.5
+++ b/doc/man/man5/slapd-ldif.5
@@ -47,6 +47,7 @@ ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
 .BR slapd.conf (5),
+.BR slapd\-config (5),
 .BR slapd (8),
 .BR ldif (5).
 .SH AUTHOR
diff --git a/doc/man/man5/slapd-monitor.5 b/doc/man/man5/slapd-monitor.5
index 3c2a1d4ca6edfa5d8797eab9eab62f2aaaec9ea0..05b20312483686ad863282920b532a76dbd4f042 100644
--- a/doc/man/man5/slapd-monitor.5
+++ b/doc/man/man5/slapd-monitor.5
@@ -118,6 +118,7 @@ backend does not honor size/time limits in search operations.
 default slapd configuration file
 .SH SEE ALSO
 .BR slapd.conf (5),
+.BR slapd\-config (5),
 .BR slapd.access (5),
 .BR slapd (8),
 .BR ldap (3).
diff --git a/doc/man/man5/slapd-ndb.5 b/doc/man/man5/slapd-ndb.5
index bb080bf094acfb92ec63c1c6ef5d24f410f9f9b7..e3d60823af2613c602833d8249c3d5c79bf9f170 100644
--- a/doc/man/man5/slapd-ndb.5
+++ b/doc/man/man5/slapd-ndb.5
@@ -116,6 +116,7 @@ default
 configuration file
 .SH SEE ALSO
 .BR slapd.conf (5),
+.BR slapd\-config (5),
 .BR slapd (8),
 .BR slapadd (8),
 .BR slapcat (8),
diff --git a/doc/man/man5/slapd-relay.5 b/doc/man/man5/slapd-relay.5
index b59d215c3094ab5821b2d09a0583b06b455e4093..dc8c2d35980b5f2cddf8c5bd3f193953da245dee 100644
--- a/doc/man/man5/slapd-relay.5
+++ b/doc/man/man5/slapd-relay.5
@@ -199,5 +199,6 @@ ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
 .BR slapd.conf (5),
+.BR slapd\-config (5),
 .BR slapo-rwm (5),
 .BR slapd (8).
diff --git a/doc/man/man5/slapd-sock.5 b/doc/man/man5/slapd-sock.5
index a0614e1409aa0f655d5c0c8a7fd9afb5a01483d2..91eb77f29ede0f4fedf43e803d6e903971f33afe 100644
--- a/doc/man/man5/slapd-sock.5
+++ b/doc/man/man5/slapd-sock.5
@@ -243,6 +243,7 @@ ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
 .BR slapd.conf (5),
+.BR slapd\-config (5),
 .BR slapd (8).
 .SH AUTHOR
 Brian Candler
diff --git a/doc/man/man5/slapo-accesslog.5 b/doc/man/man5/slapo-accesslog.5
index cf663a517a152457ea827947d3fef8bf0946c030..954ac997a03c15dc49e18e956f1f64d4a49574cb 100644
--- a/doc/man/man5/slapo-accesslog.5
+++ b/doc/man/man5/slapo-accesslog.5
@@ -475,7 +475,8 @@ as for security/audit logging purposes.
 ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
-.BR slapd.conf (5).
+.BR slapd.conf (5),
+.BR slapd\-config (5).
 
 .SH ACKNOWLEDGEMENTS
 .P
diff --git a/doc/man/man5/slapo-chain.5 b/doc/man/man5/slapo-chain.5
index e600b5fd4319ff659224c15f30134065ffed5ed2..c53779dbfac3751da1ec1971717b8f103bd3e5c7 100644
--- a/doc/man/man5/slapo-chain.5
+++ b/doc/man/man5/slapo-chain.5
@@ -141,6 +141,7 @@ ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
 .BR slapd.conf (5),
+.BR slapd\-config (5),
 .BR slapd\-ldap (5),
 .BR slapd (8).
 .SH AUTHOR
diff --git a/doc/man/man5/slapo-collect.5 b/doc/man/man5/slapo-collect.5
index 5a15f2cd30386e944ce5270336c491539ebcff36..d38d1f1d5837f905ac5c05b48b0a948cec78021f 100644
--- a/doc/man/man5/slapo-collect.5
+++ b/doc/man/man5/slapo-collect.5
@@ -40,7 +40,8 @@ should be within the naming context of the database.
 ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
-.BR slapd.conf (5).
+.BR slapd.conf (5),
+.BR slapd\-config (5),
 The
 .BR slapo-collect (5)
 overlay supports dynamic configuration via
diff --git a/doc/man/man5/slapo-constraint.5 b/doc/man/man5/slapo-constraint.5
index 50da175ffcab17fbe6e08010914f9761a15d53bf..374c1e89c3a4889457d364e7b035600f0a64f949 100644
--- a/doc/man/man5/slapo-constraint.5
+++ b/doc/man/man5/slapo-constraint.5
@@ -137,7 +137,8 @@ separated by a space, but only for entries derived from the objectClass
 ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
-.BR slapd.conf (5).
+.BR slapd.conf (5),
+.BR slapd\-config (5),
 .SH ACKNOWLEDGEMENTS
 This module was written in 2005 by Neil Dunbar of Hewlett-Packard and subsequently
 extended by Howard Chu and Emmanuel Dreyfus.
diff --git a/doc/man/man5/slapo-dds.5 b/doc/man/man5/slapo-dds.5
index cc923c5eb771218a2c707d8a263bc6e68ce8d206..b7b7ea33180adaf3f8d98e215212c435dfb105b8 100644
--- a/doc/man/man5/slapo-dds.5
+++ b/doc/man/man5/slapo-dds.5
@@ -265,6 +265,7 @@ ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
 .BR slapd.conf (5),
+.BR slapd\-config (5),
 .BR slapd (8).
 .SH AUTHOR
 Implemented by Pierangelo Masarati.
diff --git a/doc/man/man5/slapo-dyngroup.5 b/doc/man/man5/slapo-dyngroup.5
index 3e82a97651320ddaeabb26f2cb6a037f4ea99374..e37f95b8bf347850d2f53bcdbe4acaf186363994 100644
--- a/doc/man/man5/slapo-dyngroup.5
+++ b/doc/man/man5/slapo-dyngroup.5
@@ -43,6 +43,7 @@ to be evaluated for the result.
 ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
-.BR slapd.conf (5).
+.BR slapd.conf (5),
+.BR slapd\-config (5).
 .SH AUTHOR
 Howard Chu
diff --git a/doc/man/man5/slapo-dynlist.5 b/doc/man/man5/slapo-dynlist.5
index dd2074425f18ddc86acfb76ece6616c6cc770527..2aa9eaf31c31fb9392c99428fe8a5486454d44d4 100644
--- a/doc/man/man5/slapo-dynlist.5
+++ b/doc/man/man5/slapo-dynlist.5
@@ -192,6 +192,7 @@ ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
 .BR slapd.conf (5),
+.BR slapd\-config (5),
 .BR slapd (8).
 The
 .BR slapo-dynlist (5)
diff --git a/doc/man/man5/slapo-memberof.5 b/doc/man/man5/slapo-memberof.5
index 18f9095393dfca0d2b0a286a7c9e7af220587731..32e69c761d771c48d9ab7c629013639dabc8306f 100644
--- a/doc/man/man5/slapo-memberof.5
+++ b/doc/man/man5/slapo-memberof.5
@@ -113,6 +113,7 @@ ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
 .BR slapd.conf (5),
+.BR slapd\-config (5),
 .BR slapd (8).
 The
 .BR slapo-memberof (5)
diff --git a/doc/man/man5/slapo-pcache.5 b/doc/man/man5/slapo-pcache.5
index 9d083fa3b6912ee39fffaff68e6bf5783cb08b18..403f22cdda6e125044675377e1d33cd3cda1a840 100644
--- a/doc/man/man5/slapo-pcache.5
+++ b/doc/man/man5/slapo-pcache.5
@@ -241,6 +241,7 @@ ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
 .BR slapd.conf (5),
+.BR slapd\-config (5),
 .BR slapd\-ldap (5),
 .BR slapd\-meta (5),
 .BR slapd\-sql (5),
diff --git a/doc/man/man5/slapo-ppolicy.5 b/doc/man/man5/slapo-ppolicy.5
index 1f5a6e0a9bef41df132feb9e1be800d5e0b4b277..9d098b7ed13a23dc7b5a640b3588f05b993ba2d1 100644
--- a/doc/man/man5/slapo-ppolicy.5
+++ b/doc/man/man5/slapo-ppolicy.5
@@ -742,6 +742,7 @@ ppolicy_default "cn=Standard,ou=Policies,dc=example,dc=com"
 .SH SEE ALSO
 .BR ldap (3),
 .BR slapd.conf (5),
+.BR slapd\-config (5).
 .LP
 "OpenLDAP Administrator's Guide" (http://www.OpenLDAP.org/doc/admin/)
 .LP
diff --git a/doc/man/man5/slapo-refint.5 b/doc/man/man5/slapo-refint.5
index 9c46ff56f627a6027e51f7c8c28a5c9364325dbb..067735df78c171bc199c402388081163772a315a 100644
--- a/doc/man/man5/slapo-refint.5
+++ b/doc/man/man5/slapo-refint.5
@@ -61,6 +61,7 @@ It defaults to "\fIcn=Referential Integrity Overlay\fP".
 ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
-.BR slapd.conf (5).
+.BR slapd.conf (5),
+.BR slapd\-config (5).
 .SH ACKNOWLEDGEMENTS
 .so ../Project
diff --git a/doc/man/man5/slapo-retcode.5 b/doc/man/man5/slapo-retcode.5
index 9631ae6aef9d7d351fd3a4daa49e1daaf57379f3..9e6730bf293325276856bbb265e53005b68f39cf 100644
--- a/doc/man/man5/slapo-retcode.5
+++ b/doc/man/man5/slapo-retcode.5
@@ -246,6 +246,7 @@ ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
 .BR slapd.conf (5),
+.BR slapd\-config (5),
 .BR slapd (8).
 The
 .BR slapo-retcode (5)
diff --git a/doc/man/man5/slapo-rwm.5 b/doc/man/man5/slapo-rwm.5
index 98df5fb7f038a8206a0e85a81a7a776d0d5ac71a..255021bb4fa636ed1107cc3a9c00d711e48b9487 100644
--- a/doc/man/man5/slapo-rwm.5
+++ b/doc/man/man5/slapo-rwm.5
@@ -650,6 +650,7 @@ ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
 .BR slapd.conf (5),
+.BR slapd\-config (5),
 .BR slapd\-ldap (5),
 .BR slapd\-meta (5),
 .BR slapd\-relay (5),
diff --git a/doc/man/man5/slapo-syncprov.5 b/doc/man/man5/slapo-syncprov.5
index 944177d69a2ca0541103b807f70b56fb5938ff51..28becd4a0f13cd0d8885a26ec4d8a27e52750125 100644
--- a/doc/man/man5/slapo-syncprov.5
+++ b/doc/man/man5/slapo-syncprov.5
@@ -68,6 +68,7 @@ ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
 .BR slapd.conf (5),
+.BR slapd\-config (5),
 .BR slapo-accesslog (5).
 OpenLDAP Administrator's Guide.
 .SH ACKNOWLEDGEMENTS
diff --git a/doc/man/man5/slapo-translucent.5 b/doc/man/man5/slapo-translucent.5
index ba333b9d6ef05e3ed733473da4bae84a9da8ab59..25e8090ce950d6baa6bfe335e2a262d066ff405b 100644
--- a/doc/man/man5/slapo-translucent.5
+++ b/doc/man/man5/slapo-translucent.5
@@ -129,4 +129,5 @@ ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
 .BR slapd.conf (5),
+.BR slapd\-config (5),
 .BR slapd-ldap (5).
diff --git a/doc/man/man5/slapo-unique.5 b/doc/man/man5/slapo-unique.5
index b52b430305731deef864919196e9cc67666440c1..4fc35ef26ac66bf783b237905c1c7e5f3d022a20 100644
--- a/doc/man/man5/slapo-unique.5
+++ b/doc/man/man5/slapo-unique.5
@@ -150,4 +150,5 @@ maximum flexibility in meeting site-specific requirements.
 ETCDIR/slapd.conf
 default slapd configuration file
 .SH SEE ALSO
-.BR slapd.conf (5).
+.BR slapd.conf (5),
+.BR slapd\-config (5).
diff --git a/doc/man/man5/slapo-valsort.5 b/doc/man/man5/slapo-valsort.5
index 41cee564e4b7c108744e690d5346eeb4fb985a79..43e5669398c35a069f679917c58817acc0739ada 100644
--- a/doc/man/man5/slapo-valsort.5
+++ b/doc/man/man5/slapo-valsort.5
@@ -68,7 +68,8 @@ for an attribute with a syntax other than Integer or NumericString.
 \fIETCDIR/slapd.conf\fP
 default \fBslapd\fP configuration file
 .SH SEE ALSO
-.BR slapd.conf (5).
+.BR slapd.conf (5),
+.BR slapd\-config (5).
 .SH ACKNOWLEDGEMENTS
 .P
 This module was written in 2005 by Howard Chu of Symas Corporation. The
diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8
index d28a3a81e496955c4c076e02101adc5e8d718c5e..04b2573999db60af6b046bb7eb05427d89d97923 100644
--- a/doc/man/man8/slapd.8
+++ b/doc/man/man8/slapd.8
@@ -289,6 +289,7 @@ To test whether the configuration file is correct or not, type:
 .SH "SEE ALSO"
 .BR ldap (3),
 .BR slapd.conf (5),
+.BR slapd\-config (5),
 .BR slapd.access (5),
 .BR slapacl (8),
 .BR slapadd (8),
diff --git a/doc/man/man8/slappasswd.8 b/doc/man/man8/slappasswd.8
index a88edd5e45bab46f99fdf54898ebfc5d99d7e795..13bc9789c66d356f6d55acbb02f59c4c367f9a70 100644
--- a/doc/man/man8/slappasswd.8
+++ b/doc/man/man8/slappasswd.8
@@ -160,8 +160,9 @@ were clear text passwords.
 .SH "SEE ALSO"
 .BR ldappasswd (1),
 .BR ldapmodify (1),
-.BR slapd (8)
-.BR slapd.conf (5)
+.BR slapd (8),
+.BR slapd.conf (5),
+.BR slapd\-config (5),
 .B RFC 2307
 .B RFC 4519
 .B RFC 3112