5 files changed, 13 insertions, 6 deletions
diff --git a/conf/Makefile.am b/conf/Makefile.am
index ccc696781..580ea91ae 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -18,6 +18,7 @@ options = \
 	options/pool.opt \
 	options/starter.opt \
 	options/tnc.opt \
+	options/pki.opt \
 	options/tools.opt
 
 plugins = \
diff --git a/conf/options/pki.opt b/conf/options/pki.opt
new file mode 100644
index 000000000..c57dcc8c5
--- /dev/null
+++ b/conf/options/pki.opt
@@ -0,0 +1,2 @@
+pki.load =
+	Plugins to load in ipsec pki tool.
diff --git a/conf/options/tools.opt b/conf/options/tools.opt
index 72a49de28..7e30f5cd3 100644
--- a/conf/options/tools.opt
+++ b/conf/options/tools.opt
@@ -1,5 +1,2 @@
-pki.load =
-	Plugins to load in ipsec pki tool.
-
 scepclient.load =
 	Plugins to load in ipsec scepclient tool.
diff --git a/configure.ac b/configure.ac
index 4e714237c..759e4a16a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -265,11 +265,12 @@ ARG_ENABL_SET([manager],        [enable web management console (proof of concept
 ARG_ENABL_SET([medcli],         [enable mediation client configuration database plugin.])
 ARG_ENABL_SET([medsrv],         [enable mediation server web frontend and daemon plugin.])
 ARG_ENABL_SET([nm],             [enable NetworkManager backend.])
+ARG_DISBL_SET([pki],            [disable pki certificate utility.])
 ARG_DISBL_SET([scripts],        [disable additional utilities (found in directory scripts).])
 ARG_ENABL_SET([svc],            [enable charon Windows service.])
 ARG_ENABL_SET([swanctl],        [enable swanctl configuration and control tool.])
 ARG_ENABL_SET([tkm],            [enable Trusted Key Manager support.])
-ARG_DISBL_SET([tools],          [disable additional utilities (scepclient and pki).])
+ARG_DISBL_SET([tools],          [disable additional utilities (scepclient).])
 ARG_ENABL_SET([aikgen],         [enable AIK generator.])
 # optional features
 ARG_ENABL_SET([bfd-backtraces], [use binutils libbfd to resolve backtraces for memory leaks and segfaults.])
@@ -1421,10 +1422,11 @@ AM_CONDITIONAL(USE_THREADS, test x$threads = xtrue)
 AM_CONDITIONAL(USE_ADNS, test x$adns = xtrue)
 AM_CONDITIONAL(USE_CHARON, test x$charon = xtrue)
 AM_CONDITIONAL(USE_NM, test x$nm = xtrue)
+AM_CONDITIONAL(USE_PKI, test x$pki = xtrue)
 AM_CONDITIONAL(USE_TOOLS, test x$tools = xtrue)
 AM_CONDITIONAL(USE_SCRIPTS, test x$scripts = xtrue)
 AM_CONDITIONAL(USE_CONFTEST, test x$conftest = xtrue)
-AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$tools = xtrue -o x$conftest = xtrue -o x$fast = xtrue -o x$imcv = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue -o x$tls = xtrue -o x$tnc_tnccs = xtrue -o x$aikgen = xtrue -o x$svc = xtrue)
+AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$pki = xtrue -o x$tools = xtrue -o x$conftest = xtrue -o x$fast = xtrue -o x$imcv = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue -o x$tls = xtrue -o x$tnc_tnccs = xtrue -o x$aikgen = xtrue -o x$svc = xtrue)
 AM_CONDITIONAL(USE_LIBHYDRA, test x$charon = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue -o x$svc = xtrue)
 AM_CONDITIONAL(USE_LIBCHARON, test x$charon = xtrue -o x$conftest = xtrue -o x$nm = xtrue -o x$tkm = xtrue -o x$cmd = xtrue -o x$svc = xtrue)
 AM_CONDITIONAL(USE_LIBIPSEC, test x$libipsec = xtrue)
@@ -1488,6 +1490,7 @@ AM_COND_IF([USE_LIBTNCCS], [strongswan_options=${strongswan_options}" tnc"])
 AM_COND_IF([USE_MANAGER], [strongswan_options=${strongswan_options}" manager"])
 AM_COND_IF([USE_MEDSRV], [strongswan_options=${strongswan_options}" medsrv"])
 AM_COND_IF([USE_TOOLS], [strongswan_options=${strongswan_options}" tools"])
+AM_COND_IF([USE_PKI], [strongswan_options=${strongswan_options}" pki"])
 
 AC_SUBST(strongswan_options)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 89c059255..c412d9181 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,7 +73,11 @@ if USE_UPDOWN
 endif
 
 if USE_TOOLS
-  SUBDIRS += scepclient pki
+  SUBDIRS += scepclient
+endif
+
+if USE_PKI
+  SUBDIRS += pki
 endif
 
 if USE_SWANCTL