diff --git a/lib/krb5/keytab.c b/lib/krb5/keytab.c
index 0c784d791..6af541ff5 100644
--- a/lib/krb5/keytab.c
+++ b/lib/krb5/keytab.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998, 1999 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -114,8 +114,7 @@ krb5_kt_resolve(krb5_context context,
 krb5_error_code
 krb5_kt_default_name(krb5_context context, char *name, size_t namesize)
 {
-    strncpy(name, context->default_keytab, namesize);
-    if(strlen(context->default_keytab) >= namesize)
+    if (strlcpy (name, context->default_keytab, namesize) >= namesize)
 	return KRB5_CONFIG_NOTENUFSPACE;
     return 0;
 }
@@ -388,6 +387,7 @@ krb5_kt_add_entry(krb5_context context,
 {
     if(id->add == NULL)
 	return KRB5_KT_NOWRITE;
+    entry->timestamp = time(NULL);
     return (*id->add)(context, id,entry);
 }