diff --git a/kdc/config.c b/kdc/config.c
index a21103c49..e441754a6 100644
--- a/kdc/config.c
+++ b/kdc/config.c
@@ -60,6 +60,9 @@ krb5_boolean allow_null_ticket_addresses;
 #ifdef KRB4
 char *v4_realm;
 #endif
+#ifdef KASERVER
+krb5_boolean enable_kaserver = -1;
+#endif
 
 static int help_flag;
 static int version_flag;
@@ -91,6 +94,12 @@ static struct getargs args[] = {
 	"v4-realm",	'r',	arg_string, &v4_realm, 
 	"realm to serve v4-requests for"
     },
+#endif
+#ifdef KASERVER
+    {
+	"kaserver", 'K', arg_negative_flag,   &enable_kaserver,
+	"turn off kaserver support"
+    },
 #endif
     {	"ports",	'P', 	arg_string, &port_str,
 	"ports to listen to" 
@@ -203,6 +212,13 @@ configure(int argc, char **argv)
 	    v4_realm = strdup(p);
     }
 #endif
+#ifdef KASERVER
+    if (enable_kaserver == -1)
+	enable_kaserver = krb5_config_get_bool_default(context, cf, TRUE,
+						       "kdc",
+						       "enable-kaserver",
+						       NULL);
+#endif
 
     encode_as_rep_as_tgs_rep = krb5_config_get_bool(context, cf, "kdc", 
 						    "encode_as_rep_as_tgs_rep",