diff --git a/lib/krb5/verify_krb5_conf.c b/lib/krb5/verify_krb5_conf.c
index 8b1c43c32c..084f251899 100644
--- a/lib/krb5/verify_krb5_conf.c
+++ b/lib/krb5/verify_krb5_conf.c
@@ -382,15 +382,21 @@ struct entry libdefaults_entries[] = {
     { "accept_null_addresses", krb5_config_string, check_boolean, 0 },
     { "allow_weak_crypto", krb5_config_string, check_boolean, 0 },
     { "capath", krb5_config_list, all_strings, 1 },
+    { "ccapi_library", krb5_config_string, NULL, 0 },
     { "check_pac", krb5_config_string, check_boolean, 0 },
+    { "check-rd-req-server", krb5_config_string, check_boolean, 0 },
     { "clockskew", krb5_config_string, check_time, 0 },
     { "date_format", krb5_config_string, NULL, 0 },
+    { "default_as_etypes", krb5_config_string, NULL, 0 },
     { "default_cc_name", krb5_config_string, NULL, 0 },
+    { "default_cc_type", krb5_config_string, NULL, 0 },
     { "default_etypes", krb5_config_string, NULL, 0 },
     { "default_etypes_des", krb5_config_string, NULL, 0 },
     { "default_keytab_modify_name", krb5_config_string, NULL, 0 },
     { "default_keytab_name", krb5_config_string, NULL, 0 },
+    { "default_keytab_modify_name", krb5_config_string, NULL, 0 },
     { "default_realm", krb5_config_string, NULL, 0 },
+    { "default_tgs_etypes", krb5_config_string, NULL, 0 },
     { "dns_canonize_hostname", krb5_config_string, check_boolean, 0 },
     { "dns_proxy", krb5_config_string, NULL, 0 },
     { "dns_lookup_kdc", krb5_config_string, check_boolean, 0 },
@@ -404,14 +410,22 @@ struct entry libdefaults_entries[] = {
     { "fcc-mit-ticketflags", krb5_config_string, check_boolean, 0 },
     { "forward", krb5_config_string, check_boolean, 0 },
     { "forwardable", krb5_config_string, check_boolean, 0 },
+    { "host_timeout", krb5_config_string, check_time, 0 },
     { "http_proxy", krb5_config_string, check_host /* XXX */, 0 },
     { "ignore_addresses", krb5_config_string, NULL, 0 },
+    { "k5login_authoritative", krb5_config_string, check_boolean, 0 },
+    { "k5login_directory", krb5_config_string, NULL, 0 },
     { "kdc_timeout", krb5_config_string, check_time, 0 },
     { "kdc_timesync", krb5_config_string, check_boolean, 0 },
+    { "kuserok", krb5_config_string, NULL, 0 },
+    { "large_message_size", krb5_config_string, check_numeric, 0 },
     { "log_utc", krb5_config_string, check_boolean, 0 },
-    { "max_retries", krb5_config_string, check_time, 0 },
-    { "maxretries", krb5_config_string, check_numeric, 0 },
+    { "max_retries", krb5_config_string, check_numeric, 0 },
+    { "maximum_message_size", krb5_config_string, check_numeric, 0 },
+    { "moduli", krb5_config_string, NULL, 0 },
+    { "name_canon_rules", krb5_config_string, NULL, 0 },
     { "no-addresses", krb5_config_string, check_boolean, 0 },
+    { "pkinit_dh_min_bits", krb5_config_string, NULL, 0 },
     { "proxiable", krb5_config_string, check_boolean, 0 },
     { "renew_lifetime", krb5_config_string, check_time, 0 },
     { "scan_interfaces", krb5_config_string, check_boolean, 0 },
@@ -420,10 +434,12 @@ struct entry libdefaults_entries[] = {
     { "ticket_lifetime", krb5_config_string, check_time, 0 },
     { "time_format", krb5_config_string, NULL, 0 },
     { "transited_realms_reject", krb5_config_string, NULL, 0 },
+    { "use_fallback", krb5_config_string, check_boolean, 0 },
     { "v4_instance_resolve", krb5_config_string, check_boolean, 0 },
     { "v4_name_convert", krb5_config_list, v4_name_convert_entries, 0 },
     { "verify_ap_req_nofail", krb5_config_string, check_boolean, 0 },
     { "warn_pwexpire", krb5_config_string, check_time, 0 },
+
     /* MIT stuff */
     { "permitted_enctypes", krb5_config_string, mit_entry, 0 },
     { "default_tgs_enctypes", krb5_config_string, mit_entry, 0 },
@@ -445,9 +461,12 @@ struct entry appdefaults_entries[] = {
     { "renew_lifetime", krb5_config_string, check_time, 0 },
     { "no-addresses", krb5_config_string, check_boolean, 0 },
     { "pkinit_anchors", krb5_config_string, NULL, 0 },
+    { "pkinit_pool", krb5_config_string, NULL, 0 },
     { "pkinit_require_eku", krb5_config_string, NULL, 0 },
     { "pkinit_require_hostname_match", krb5_config_string, NULL, 0 },
     { "pkinit_require_krbtgt_otherName", krb5_config_string, NULL, 0 },
+    { "pkinit_revoke", krb5_config_string, NULL, 0 },
+    { "pkinit_trustedCertifiers", krb5_config_string, check_boolean, 0 },
     { "pkinit_win2k", krb5_config_string, NULL, 0 },
     { "pkinit_win2k_require_binding", krb5_config_string, NULL, 0 },
     { "ticket_lifetime", krb5_config_string, check_time, 0 },
@@ -457,13 +476,27 @@ struct entry appdefaults_entries[] = {
 
 struct entry realms_entries[] = {
     { "admin_server", krb5_config_string, check_host, 0 },
+    { "auth_to_local", krb5_config_string, NULL, 0 },
+    { "auth_to_local_names", krb5_config_string, NULL, 0 },
     { "default_domain", krb5_config_string, NULL, 0 },
     { "forwardable", krb5_config_string, check_boolean, 0 },
     { "kdc", krb5_config_string, check_host, 0 },
     { "kpasswd_server", krb5_config_string, check_host, 0 },
     { "krb524_server", krb5_config_string, check_host, 0 },
+    { "kx509_ca", krb5_config_string, NULL, 0 },
+    { "kx509_include_pkinit_san", krb5_config_string, check_boolean, 0 },
+    { "name_canon_rules", krb5_config_string, NULL, 0 },
+    { "no-addresses", krb5_config_string, check_boolean, 0 },
+    { "pkinit_anchors", krb5_config_string, NULL, 0 },
+    { "pkinit_require_eku", krb5_config_string, NULL, 0 },
+    { "pkinit_require_hostname_match", krb5_config_string, NULL, 0 },
+    { "pkinit_require_krbtgt_otherName", krb5_config_string, NULL, 0 },
+    { "pkinit_trustedCertifiers", krb5_config_string, check_boolean, 0 },
+    { "pkinit_win2k", krb5_config_string, NULL, 0 },
+    { "pkinit_win2k_require_binding", krb5_config_string, NULL, 0 },
     { "proxiable", krb5_config_string, check_boolean, 0 },
     { "renew_lifetime", krb5_config_string, check_time, 0 },
+    { "require_initial_kca_tickets", krb5_config_string, check_boolean, 0 },
     { "ticket_lifetime", krb5_config_string, check_time, 0 },
     { "v4_domains", krb5_config_string, NULL, 0 },
     { "v4_instance_convert", krb5_config_list, all_strings, 0 },
@@ -480,6 +513,7 @@ struct entry realms_entries[] = {
     { "dict_file", krb5_config_string, mit_entry, 0 },
     { "kadmind_port", krb5_config_string, mit_entry, 0 },
     { "kpasswd_port", krb5_config_string, mit_entry, 0 },
+    { "master_kdc", krb5_config_string, mit_entry, 0 },
     { "master_key_name", krb5_config_string, mit_entry, 0 },
     { "master_key_type", krb5_config_string, mit_entry, 0 },
     { "key_stash_file", krb5_config_string, mit_entry, 0 },
@@ -510,38 +544,56 @@ struct entry kdc_entries[] = {
     { "allow-null-ticket-addresses", krb5_config_string, check_boolean, 0 },
     { "check-ticket-addresses", krb5_config_string, check_boolean, 0 },
     { "database", krb5_config_list, kdc_database_entries, 0 },
+    { "detach", krb5_config_string, check_boolean, 0 },
     { "digests_allowed", krb5_config_string, NULL, 0 },
+    { "disable-des", krb5_config_string, check_boolean, 0 },
     { "enable-524", krb5_config_string, check_boolean, 0 },
     { "enable-digest", krb5_config_string, check_boolean, 0 },
     { "enable-kaserver", krb5_config_string, check_boolean, 1 },
-    { "enable-kerberos4", krb5_config_string, check_boolean, 0 },
+    { "enable-kerberos4", krb5_config_string, check_boolean, 1 },
+    { "enable-kx509", krb5_config_string, check_boolean, 0 },
     { "enable-http", krb5_config_string, check_boolean, 0 },
     { "enable-pkinit", krb5_config_string, check_boolean, 0 },
     { "encode_as_rep_as_tgs_rep", krb5_config_string, check_boolean, 0 },
+    { "enforce-transited-policy", krb5_config_string, NULL, 1 },
     { "hdb-ldap-create-base", krb5_config_string, NULL, 0 },
+    { "iprop-acl", krb5_config_string, NULL, 0 },
+    { "iprop-stats", krb5_config_string, NULL, 0 },
+    { "kdc-request-log", krb5_config_string, NULL, 0 },
     { "kdc_warn_pwexpire", krb5_config_string, check_time, 0 },
     { "key-file", krb5_config_string, NULL, 0 },
     { "kx509_ca", krb5_config_string, NULL, 0 },
     { "kx509_include_pkinit_san", krb5_config_string, check_boolean, 0 },
+    { "kx509_template", krb5_config_string, NULL, 0 },
     { "logging", krb5_config_string, check_log, 0 },
+    { "max-kdc-datagram-reply-length", krb5_config_string, check_bytes, 0 },
     { "max-request", krb5_config_string, check_bytes, 0 },
-    { "pkinit_allow_proxy_certificate", krb5_config_string, NULL, 0 },
+    { "pkinit_allow_proxy_certificate", krb5_config_string, check_boolean, 0 },
     { "pkinit_anchors", krb5_config_string, NULL, 0 },
-    { "pkinit_dh_min_bits", krb5_config_string, NULL, 0 },
+    { "pkinit_dh_min_bits", krb5_config_string, check_numeric, 0 },
     { "pkinit_identity", krb5_config_string, NULL, 0 },
+    { "pkinit_kdc_friendly_name", krb5_config_string, NULL, 0 },
     { "pkinit_kdc_ocsp", krb5_config_string, NULL, 0 },
+    { "pkinit_mappings_file", krb5_config_string, NULL, 0 },
     { "pkinit_pool", krb5_config_string, NULL, 0 },
-    { "pkinit_principal_in_certificate", krb5_config_string, NULL, 0 },
+    { "pkinit_principal_in_certificate", krb5_config_string, check_boolean, 0 },
     { "pkinit_revoke", krb5_config_string, NULL, 0 },
+    { "pkinit_win2k_require_binding", krb5_config_string, check_boolean, 0 },
     { "ports", krb5_config_string, NULL, 0 },
+    { "preauth-use-strongest-session-key", krb5_config_string, check_boolean, 0 },
     { "require_initial_kca_tickets", krb5_config_string, check_boolean, 0 },
     { "require-preauth", krb5_config_string, check_boolean, 0 },
+    { "svc-use-strongest-session-key", krb5_config_string, check_boolean, 0 },
+    { "tgt-use-strongest-session-key", krb5_config_string, check_boolean, 0 },
+    { "transited-policy", krb5_config_string, NULL, 0 },
     { "use_2b", krb5_config_list, NULL, 0 },
+    { "use-strongest-server-key", krb5_config_string, check_boolean, 0 },
     { "v4_realm", krb5_config_string, NULL, 0 },
     { NULL, 0, NULL, 0 }
 };
 
 struct entry kadmin_entries[] = {
+    { "allow_self_change_password", krb5_config_string, check_boolean, 0 },
     { "default_keys", krb5_config_string, NULL, 0 },
     { "password_lifetime", krb5_config_string, check_time, 0 },
     { "require-preauth", krb5_config_string, check_boolean, 0 },
@@ -567,11 +619,23 @@ struct entry capaths_entries[] = {
     { NULL, 0, NULL, 0 }
 };
 
+struct entry kcm_entries[] = {
+    { "detach", krb5_config_string, check_boolean, 0 },
+    { "disallow-getting-krbtgt", krb5_config_string, check_boolean, 0 },
+    { "logging", krb5_config_string, NULL, 0 },
+    { "max-request", krb5_config_string, NULL, 0 },
+    { "system_ccache", krb5_config_string, NULL, 0 },
+    { NULL, 0, NULL, 0 }
+};
+
 struct entry password_quality_entries[] = {
+    { "check_function", krb5_config_string, NULL, 0 },
+    { "check_library", krb5_config_string, NULL, 0 },
     { "external_program", krb5_config_string, NULL, 0 },
     { "min_classes", krb5_config_string, check_numeric, 0 },
     { "min_length", krb5_config_string, check_numeric, 0 },
     { "policies", krb5_config_string, NULL, 0 },
+    { "policy_libraries", krb5_config_string, NULL, 0 },
     { "", krb5_config_list, all_strings, 0 },
     { NULL, 0, NULL, 0 }
 };
@@ -582,6 +646,7 @@ struct entry toplevel_sections[] = {
     { "domain_realm", krb5_config_list, all_strings, 0 },
     { "gssapi", krb5_config_list, NULL, 0 },
     { "kadmin", krb5_config_list, kadmin_entries, 0 },
+    { "kcm", krb5_config_list, kcm_entries, 0 },
     { "kdc", krb5_config_list, kdc_entries, 0 },
     { "libdefaults" , krb5_config_list, libdefaults_entries, 0 },
     { "logging", krb5_config_list, log_strings, 0 },