diff --git a/lib/krb5/context.c b/lib/krb5/context.c
index 6ce7f853e..d6220039e 100644
--- a/lib/krb5/context.c
+++ b/lib/krb5/context.c
@@ -96,6 +96,11 @@ krb5_init_context(krb5_context *context)
 	    krb5_config_free_strings(etypes);
 	}
     }
+    p->time_fmt = krb5_config_get_string(p, NULL, "libdefaults", 
+					 "time_format", NULL);
+    if(p->time_fmt == NULL)
+	p->time_fmt = "%d-%b-%Y %H:%M:%S";
+    p->log_utc = krb5_config_get_bool(p, NULL, "libdefaults", "log_utc", NULL);
 #ifdef MEGA_SCHLEMM
     {
 	const char * tmp = krb5_config_get_string(p, NULL, "libdefaults", 
diff --git a/lib/krb5/log.c b/lib/krb5/log.c
index e2589e529..e4252c517 100644
--- a/lib/krb5/log.c
+++ b/lib/krb5/log.c
@@ -362,7 +362,8 @@ krb5_vlog_msg(krb5_context context,
 
     vasprintf(&msg, fmt, ap);
     t = time(NULL);
-    strftime(buf, sizeof(buf), "%d-%b-%Y %H:%M:%S", localtime(&t));
+    strftime(buf, sizeof(buf), context->time_fmt, 
+	     context->log_utc ? gmtime(&t) : localtime(&t));
     for(i = 0; i < fac->len; i++)
 	if(fac->val[i].min <= level && 
 	   (fac->val[i].max < 0 || fac->val[i].max >= level))