diff --git a/conf/Makefile.am b/conf/Makefile.am
index 19fce81a7..86792ae3e 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -12,8 +12,13 @@ options = \
 	options/charon.opt \
 	options/charon-logging.opt \
 	options/imcv.opt \
+	options/manager.opt \
+	options/medsrv.opt \
 	options/pacman.opt \
-	options/tnc.opt
+	options/pool.opt \
+	options/starter.opt \
+	options/tnc.opt \
+	options/tools.opt
 
 plugins = \
 	plugins/android_log.opt \
diff --git a/conf/options/manager.opt b/conf/options/manager.opt
new file mode 100644
index 000000000..d84d6eb0a
--- /dev/null
+++ b/conf/options/manager.opt
@@ -0,0 +1,17 @@
+manager.database =
+	Credential database URI for manager.
+
+manager.debug = no
+	Enable debugging in manager.
+
+manager.load =
+	Plugins to load in manager.
+
+manager.socket =
+	FastCGI socket of manager, to run it statically.
+
+manager.threads = 10
+	Threads to use for request handling.
+
+manager.timeout = 15m
+	Session timeout for manager.
diff --git a/conf/options/medsrv.opt b/conf/options/medsrv.opt
new file mode 100644
index 000000000..8b31c8831
--- /dev/null
+++ b/conf/options/medsrv.opt
@@ -0,0 +1,26 @@
+medsrv.database =
+	Mediation server database URI.
+
+medsrv.debug = no
+	Debugging in mediation server web application.
+
+medsrv.dpd = 5m
+	DPD timeout to use in mediation server plugin.
+
+medsrv.load =
+	Plugins to load in mediation server plugin.
+
+medsrv.password_length = 6
+	Minimum password length required for mediation server user accounts.
+
+medsrv.rekey = 20m
+	Rekeying time on mediation connections in mediation server plugin.
+
+medsrv.socket =
+	Run Mediation server web application statically on socket.
+
+medsrv.threads = 5
+	Number of thread for mediation service web application.
+
+medsrv.timeout = 15m
+	Session timeout for mediation service.
diff --git a/conf/options/pool.opt b/conf/options/pool.opt
new file mode 100644
index 000000000..b030b17be
--- /dev/null
+++ b/conf/options/pool.opt
@@ -0,0 +1,6 @@
+pool.database
+	Database URI for the database that stores IP pools and configuration
+	attributes.
+
+pool.load =
+	Plugins to load in ipsec pool tool.
diff --git a/conf/options/starter.opt b/conf/options/starter.opt
new file mode 100644
index 000000000..4e6574d58
--- /dev/null
+++ b/conf/options/starter.opt
@@ -0,0 +1,5 @@
+starter.load =
+	Plugins to load in starter.
+
+starter.load_warning = yes
+	Disable charon plugin load option warning.
diff --git a/conf/options/tools.opt b/conf/options/tools.opt
new file mode 100644
index 000000000..23e6a1c9f
--- /dev/null
+++ b/conf/options/tools.opt
@@ -0,0 +1,8 @@
+openac.load =
+	Plugins to load in ipsec openac tool.
+
+pki.load =
+	Plugins to load in ipsec pki tool.
+
+scepclient.load =
+	Plugins to load in ipsec scepclient tool.