diff --git a/kdc/kstash.c b/kdc/kstash.c
index 8b9aad342..d2528eeaa 100644
--- a/kdc/kstash.c
+++ b/kdc/kstash.c
@@ -37,7 +37,7 @@ RCSID("$Id$");
 
 krb5_context context;
 
-static const char *keyfile = HDB_DB_DIR "/m-key";
+static char *keyfile;
 static int convert_flag;
 static int help_flag;
 static int version_flag;
@@ -84,6 +84,9 @@ main(int argc, char **argv)
 	krb5_errx(context, 1, "random-key and master-key-fd "
 		  "is mutual exclusive");
 
+    if (keyfile == NULL)
+	asprintf(&keyfile, "%s/m-key", hdb_db_dir(context));
+
     ret = krb5_string_to_enctype(context, enctype_str, &enctype);
     if(ret)
 	krb5_err(context, 1, ret, "krb5_string_to_enctype");