diff --git a/client/Makefile.am b/client/Makefile.am
index 6d0cdbcaf..551eb661b 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -92,6 +92,7 @@ ipa_join_LDADD = 		\
 SUBDIRS =			\
 	share		\
 	man			\
+	sysconfig	\
 	$(NULL)
 
 noinst_HEADERS =		\
diff --git a/client/sysconfig/Makefile.am b/client/sysconfig/Makefile.am
new file mode 100644
index 000000000..b99b8cbc1
--- /dev/null
+++ b/client/sysconfig/Makefile.am
@@ -0,0 +1,8 @@
+# This file will be processed with automake-1.7 to create Makefile.in
+#
+AUTOMAKE_OPTIONS = 1.7
+
+dist_sysconfenv_DATA = 		\
+	certmonger
+
+CLEANFILES = $(nodist_sysconfenv_DATA)
diff --git a/client/sysconfig/certmonger b/client/sysconfig/certmonger
new file mode 100644
index 000000000..f54bdd699
--- /dev/null
+++ b/client/sysconfig/certmonger
@@ -0,0 +1 @@
+OPTS=-d2
diff --git a/configure.ac b/configure.ac
index f060f3a52..87418cccb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -509,6 +509,7 @@ AC_CONFIG_FILES([
     client/Makefile
     client/share/Makefile
     client/man/Makefile
+    client/sysconfig/Makefile
     contrib/completion/Makefile
     contrib/Makefile
     daemons/dnssec/Makefile
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 3d5dd1302..5d6cb3f1b 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -1198,6 +1198,7 @@ fi
 %{_sbindir}/ipa-join
 %{_bindir}/ipa
 %config %{_sysconfdir}/bash_completion.d
+%config %{_sysconfdir}/sysconfig/certmonger
 %{_mandir}/man1/ipa.1*
 %{_mandir}/man1/ipa-getkeytab.1*
 %{_mandir}/man1/ipa-rmkeytab.1*