diff --git a/doc/setup.texi b/doc/setup.texi
index 0755fe64c..f962bddc3 100644
--- a/doc/setup.texi
+++ b/doc/setup.texi
@@ -1270,7 +1270,7 @@ Write about the kdc.
 
 @example
 [kdc]
-	pkinit_enable = yes
+	enable-pkinit = yes
 	pkinit_identity = FILE:/secure/kdc.crt,/secure/kdc.key
 	pkinit_anchors = FILE:/path/to/trust-anchors.pem
 	pkinit_pool = PKCS12:/path/to/useful-intermediate-certs.pfx
diff --git a/kdc/config.c b/kdc/config.c
index 656fb39d4..ae6ba15cf 100644
--- a/kdc/config.c
+++ b/kdc/config.c
@@ -512,7 +512,7 @@ configure(krb5_context context, int argc, char **argv)
 				     NULL, 
 				     config->enable_pkinit,
 				     "kdc",
-				     "pkinit_enable",
+				     "enable-pkinit",
 				     NULL);
     if (config->enable_pkinit) {
 	const char *user_id, *anchors, *ocsp_file;
diff --git a/tests/kdc/krb5.conf.in b/tests/kdc/krb5.conf.in
index f1bb46ebe..a522c7bae 100644
--- a/tests/kdc/krb5.conf.in
+++ b/tests/kdc/krb5.conf.in
@@ -18,7 +18,7 @@
 [kdc]
 	enable-digest = true
 
-	pkinit_enable = true
+	enable-pkinit = true
 	pkinit_identity = FILE:@srcdir@/../../lib/hx509/data/kdc.crt,@srcdir@/../../lib/hx509/data/kdc.key
 	pkinit_anchors = FILE:@srcdir@/../../lib/hx509/data/ca.crt
 	pkinit_pool = FILE:@srcdir@/../../lib/hx509/data/sub-ca.crt