diff --git a/docs/funcd.pod b/docs/funcd.pod
index 62fd57a..dd44622 100644
--- a/docs/funcd.pod
+++ b/docs/funcd.pod
@@ -4,7 +4,13 @@ funcd -- deaemon for the Fedora Universal Network Controller
 
 =head1 SYNOPSIS
 
-funcd (it's a daemon and takes no arguments)
+=over
+
+=item funcd [--daemon]
+
+=item funcd --list-modules
+
+=back
 
 =head1 DESCRIPTION
 
@@ -12,11 +18,23 @@ funcd registers itself to a certificate server (certmaster) listed in /etc/certm
 
 Modules and capabilities provided by funcd are specified at https://hosted.fedoraproject.org/projects/func/
 
+=head1 OPTIONS
+
+=over 16
+
+=item B<--daemon>		daemonize the server on startup
+
+=item B<--list-modules>	list modules that would be loaded and exit
+
+=back
+
 =head1 ADDITONAL RESOURCES
 
 See https://hosted.fedoraproject.org/projects/func/.  It's a Wiki.
 
-See also the manpages for "func", "certmaster", "certmaster-ca", and "func-transmit".
+=head1 SEE ALSO
+
+L<func(1)>, L<certmaster(1)>, L<certmaster-ca(1)>, L<func-transmit(1)>
 
 =head1 AUTHOR
 
diff --git a/func/minion/server.py b/func/minion/server.py
index 9bd77b0..64a8645 100755
--- a/func/minion/server.py
+++ b/func/minion/server.py
@@ -247,6 +247,14 @@ def main(argv):
     Start things up.
     """
 
+    if len(sys.argv) > 1 and sys.argv[1] == "--list-modules":
+        module_names = module_loader.load_modules().keys()
+        module_names.sort()
+        print "loaded modules:"
+        for foo in module_names:
+            print "\t" + foo
+        sys.exit(0)
+
     if "daemon" in sys.argv or "--daemon" in sys.argv:
         utils.daemonize("/var/run/funcd.pid")
     else: