diff --git a/doc/man/man8/slapacl.8 b/doc/man/man8/slapacl.8
index fc369a3b98..4c392391e6 100644
--- a/doc/man/man8/slapacl.8
+++ b/doc/man/man8/slapacl.8
@@ -8,6 +8,7 @@ slapacl \- Check access to a list of attributes.
 .B [\-v]
 .B [\-d level]
 .B [\-f slapd.conf]
+.B [\-F confdir]
 .B [\-D authcDN | \-U authcID]
 .B \-b DN
 .B [\-u]
@@ -46,6 +47,19 @@ specify an alternative
 .BR slapd.conf (5)
 file.
 .TP
+.BI \-F " confdir"
+specify a config directory.
+If both
+.B -f
+and
+.B -F
+are specified, the config file will be read and converted to
+config directory format and written to the specified directory.
+If neither option is specified, an attempt to read the
+default config directory wll be made before trying to use the default
+config file. If a valid config directory exists then the
+default config file is ignored.
+.TP
 .BI \-D " authcDN"
 specify a DN to be used as identity through the test session
 when selecting appropriate
diff --git a/doc/man/man8/slapadd.8 b/doc/man/man8/slapadd.8
index 818f77cbe9..6235288905 100644
--- a/doc/man/man8/slapadd.8
+++ b/doc/man/man8/slapadd.8
@@ -15,6 +15,7 @@ slapadd \- Add entries to a SLAPD database
 .B [\-b suffix]
 .B [\-n dbnum]
 .B [\-f slapd.conf]
+.B [\-F confdir]
 .B [\-l ldif-file]
 .SH DESCRIPTION
 .LP
@@ -85,6 +86,20 @@ specify an alternative
 .BR slapd.conf (5)
 file.
 .TP
+.BI \-F " confdir"
+specify a config directory.
+If both
+.B -f
+and
+.B -F
+are specified, the config file will be read and converted to
+config directory format and written to the specified directory.
+If neither option is specified, an attempt to read the
+default config directory wll be made before trying to use the default
+config file. If a valid config directory exists then the
+default config file is ignored. If dryrun mode is also specified,
+no conversion will occur.
+.TP
 .BI \-l " ldif-file"
 Read LDIF from the specified file instead of standard input.
 .SH LIMITATIONS
diff --git a/doc/man/man8/slapauth.8 b/doc/man/man8/slapauth.8
index 6b8242c610..eb91acf850 100644
--- a/doc/man/man8/slapauth.8
+++ b/doc/man/man8/slapauth.8
@@ -8,6 +8,7 @@ slapauth \- Check a list of string-represented IDs for authc/authz.
 .B [\-v]
 .B [\-d level]
 .B [\-f slapd.conf]
+.B [\-F confdir]
 .B [\-M mech]
 .B [\-R realm]
 .B [\-U authcID]
@@ -44,6 +45,19 @@ specify an alternative
 .BR slapd.conf (5)
 file.
 .TP
+.BI \-F " confdir"
+specify a config directory.
+If both
+.B -f
+and
+.B -F
+are specified, the config file will be read and converted to
+config directory format and written to the specified directory.
+If neither option is specified, an attempt to read the
+default config directory wll be made before trying to use the default
+config file. If a valid config directory exists then the
+default config file is ignored.
+.TP
 .BI \-M " mech"
 specify a mechanism.
 .TP
diff --git a/doc/man/man8/slapcat.8 b/doc/man/man8/slapcat.8
index 03a0aa5d4a..0687bd73b9 100644
--- a/doc/man/man8/slapcat.8
+++ b/doc/man/man8/slapcat.8
@@ -14,6 +14,7 @@ slapcat \- SLAPD database to LDIF utility
 .B [\-a filter]
 .B [\-s subtree-dn]
 .B [\-f slapd.conf]
+.B [\-F confdir]
 .B [\-l ldif-file]
 .B 
 .LP
@@ -87,6 +88,19 @@ Specify an alternative
 .BR slapd.conf (5)
 file.
 .TP
+.BI \-F " confdir"
+specify a config directory.
+If both
+.B -f
+and
+.B -F
+are specified, the config file will be read and converted to
+config directory format and written to the specified directory.
+If neither option is specified, an attempt to read the
+default config directory wll be made before trying to use the default
+config file. If a valid config directory exists then the
+default config file is ignored.
+.TP
 .BI \-l " ldif-file"
 Write LDIF to specified file instead of standard output.
 .SH LIMITATIONS
diff --git a/doc/man/man8/slapdn.8 b/doc/man/man8/slapdn.8
index c2a54649ca..9099256db9 100644
--- a/doc/man/man8/slapdn.8
+++ b/doc/man/man8/slapdn.8
@@ -41,6 +41,19 @@ specify an alternative
 .BR slapd.conf (5)
 file.
 .TP
+.BI \-F " confdir"
+specify a config directory.
+If both
+.B -f
+and
+.B -F
+are specified, the config file will be read and converted to
+config directory format and written to the specified directory.
+If neither option is specified, an attempt to read the
+default config directory wll be made before trying to use the default
+config file. If a valid config directory exists then the
+default config file is ignored.
+.TP
 .BI \-N
 only output a normalized form of the DN, suitable to be used
 in a normalization tool; incompatible with
diff --git a/doc/man/man8/slapindex.8 b/doc/man/man8/slapindex.8
index f99d09d3fb..57a0391efa 100644
--- a/doc/man/man8/slapindex.8
+++ b/doc/man/man8/slapindex.8
@@ -13,6 +13,7 @@ slapindex \- SLAPD index to LDIF utility
 .B [\-b suffix]
 .B [\-n dbnum]
 .B [\-f slapd.conf]
+.B [\-F confdir]
 .B 
 .LP
 .SH DESCRIPTION
@@ -63,6 +64,19 @@ option.
 specify an alternative
 .BR slapd.conf (5)
 file.
+.TP
+.BI \-F " confdir"
+specify a config directory.
+If both
+.B -f
+and
+.B -F
+are specified, the config file will be read and converted to
+config directory format and written to the specified directory.
+If neither option is specified, an attempt to read the
+default config directory wll be made before trying to use the default
+config file. If a valid config directory exists then the
+default config file is ignored.
 .SH LIMITATIONS
 Your
 .BR slapd (8)
diff --git a/doc/man/man8/slaptest.8 b/doc/man/man8/slaptest.8
index cdedb9479c..ccdfa43b94 100644
--- a/doc/man/man8/slaptest.8
+++ b/doc/man/man8/slaptest.8
@@ -45,8 +45,7 @@ If neither option is specified, slaptest will attempt to read the
 default config directory before trying to use the default
 config file. If a valid config directory exists then the
 default config file is ignored. If dryrun mode is also specified,
-no conversion will occur. All of the slap tools that
-use the config options observe this same behavior.
+no conversion will occur.
 .TP
 .B \-u
 enable dryrun mode (i.e. don't fail if databases cannot be opened,