diff --git a/kdc/main.c b/kdc/main.c
index ae01d4781..a6506932a 100644
--- a/kdc/main.c
+++ b/kdc/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -62,9 +62,9 @@ main(int argc, char **argv)
     ret = hdb_create(context, &db, database);
     if(ret)
 	krb5_err(context, 1, ret, "hdb_create %s", database);
-    ret = hdb_set_master_key(context, db, keyfile);
+    ret = hdb_set_master_keyfile(context, db, keyfile);
     if (ret)
-	krb5_err(context, 1, ret, "hdb_set_master_key");
+	krb5_err(context, 1, ret, "hdb_set_master_keyfile");
 
 #ifdef HAVE_SIGACTION
     {
diff --git a/lib/kadm5/init_s.c b/lib/kadm5/init_s.c
index 66443065d..cba633c0f 100644
--- a/lib/kadm5/init_s.c
+++ b/lib/kadm5/init_s.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997, 1998, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -57,8 +57,8 @@ kadm5_s_init_with_context(krb5_context context,
     ret = hdb_create(ctx->context, &ctx->db, NULL);
     if(ret)
 	return ret;
-    ret = hdb_set_master_key (ctx->context, 
-			      ctx->db, NULL); /* XXX get from conf */
+    ret = hdb_set_master_keyfile (ctx->context, 
+				  ctx->db, NULL); /* XXX get from conf */
     if(ret)
 	return ret;