diff --git a/kdc/config.c b/kdc/config.c
index dbaad14e1..bdf97609b 100644
--- a/kdc/config.c
+++ b/kdc/config.c
@@ -38,13 +38,15 @@
 
 #include "kdc_locl.h"
 #include <getarg.h>
+#include <parse_units.h>
 
 RCSID("$Id$");
 
 static char *config_file;
-int loglevel = -2;
-int require_preauth = 1;
+int require_preauth = -1;
 char *keyfile;
+char *max_request_str;
+size_t max_request;
 time_t kdc_warn_pwexpire;
 
 #ifdef KRB4
@@ -58,10 +60,6 @@ static struct getargs args[] = {
 	"config-file",	'c',	arg_string,	&config_file, 
 	"location of config file",	"file" 
     },
-    { 
-	"log-level",	0,	arg_integer,	&loglevel, 
-	"level of logging"
-    },
     { 
 	"require-preauth",	'p',	arg_negative_flag, &require_preauth, 
 	"don't require pa-data in as-reqs"
@@ -70,6 +68,10 @@ static struct getargs args[] = {
 	"key-file",	'k',	arg_string, &keyfile, 
 	"location of master key file", "file"
     },
+    { 
+	"max-request",	0,	arg_string, &max_request, 
+	"max size for a kdc-request", "size"
+    },
 #ifdef KRB4
     { 
 	"v4-realm",	'r',	arg_string, &v4_realm, 
@@ -83,6 +85,15 @@ static int num_args = sizeof(args) / sizeof(args[0]);
 
 extern const char *krb5_config_get_string(krb5_config_section*, ...);
 
+struct units byte_units[] = {
+    { "megabyte", 1024 * 1024 },
+    { "mbyte", 1024 * 1024 },
+    { "kilobyte", 1024 },
+    { "kbyte", 1024 },
+    { "byte", 1 },
+    { NULL, 0 }
+};
+
 void
 configure(int argc, char **argv)
 {
@@ -105,15 +116,6 @@ configure(int argc, char **argv)
     if(krb5_config_parse_file(config_file, &cf))
 	goto end;
     
-    if(loglevel == -2){
-	p = krb5_config_get_string (cf, 
-				    "kdc",
-				    "log-level",
-				    NULL);
-	if(p)
-	    loglevel = atoi(p);
-    }
-
     if(keyfile == NULL){
 	p = krb5_config_get_string (cf, 
 				    "kdc",
@@ -123,6 +125,19 @@ configure(int argc, char **argv)
 	    keyfile = strdup(p);
     }
     
+    if(max_request_str){
+	max_request = parse_units(max_request_str, byte_units, NULL);
+    }
+
+    if(max_request == 0){
+	p = krb5_config_get_string (cf, 
+				    "kdc",
+				    "max-request",
+				    NULL);
+	if(p)
+	    max_request = parse_units(max_request_str, byte_units, NULL);
+    }
+    
     if(require_preauth == -1){
 	p = krb5_config_get_string (cf, 
 				    "kdc",
@@ -158,8 +173,8 @@ configure(int argc, char **argv)
     
     krb5_config_file_free (cf);
 end:
-    if(loglevel == -2)
-	loglevel = 0;
+    if(max_request == 0)
+	max_request = 64 * 1024;
     if(require_preauth == -1)
 	require_preauth = 1;
 #ifdef KRB4