diff --git a/doc/fwknopd.man.asciidoc b/doc/fwknopd.man.asciidoc
index cd5de2ea..0811b481 100644
--- a/doc/fwknopd.man.asciidoc
+++ b/doc/fwknopd.man.asciidoc
@@ -56,6 +56,11 @@ COMMAND-LINE OPTIONS
     not given, 'fwknopd' will use the compile-time default location (typically
     '@sysconfdir@/fwknop/access.conf').
 
+*--access-folder*='<access-folder>'::
+    Specify the location of the 'access.conf' folder. If this option is
+    given, rather than load a single access.conf file, all the .conf
+    files in the given folders are processed.
+
 *-c, --config*='<config-file>'::
     Specify the location of the 'fwknopd.conf' file. If this option is
     not given, 'fwknopd' will use the default location (typically
diff --git a/server/config_init.c b/server/config_init.c
index 435faf13..214838f7 100644
--- a/server/config_init.c
+++ b/server/config_init.c
@@ -1395,6 +1395,8 @@ usage(void)
     fprintf(stdout,
       "Usage: fwknopd [options]\n\n"
       " -a, --access-file       - Specify an alternate access.conf file.\n"
+      "     --access-folder     - Specify an access.conf folder.  All .conf\n"
+      "                           files in this folder will be processed.\n"
       " -c, --config-file       - Specify an alternate configuration file.\n"
       " -f, --foreground        - Run fwknopd in the foreground (do not become\n"
       "                           a background daemon).\n"