diff --git a/lib/krb5/fcache.c b/lib/krb5/fcache.c
index 98eff7eed..60422339e 100644
--- a/lib/krb5/fcache.c
+++ b/lib/krb5/fcache.c
@@ -405,7 +405,12 @@ fcc_store_cred(krb5_context context,
 	sp = krb5_storage_from_fd(fd);
 	krb5_storage_set_eof_code(sp, KRB5_CC_END);
 	storage_set_flags(context, sp, FCACHE(id)->version);
-	ret = krb5_store_creds(sp, creds);
+	if (krb5_config_get_bool_default(context, NULL, TRUE,
+					 "libdefaults",
+					 "fcc-mit-ticketflags"))
+	    ret = _krb5_store_creds_heimdal_0_7(sp, creds);
+	else
+	    ret = _krb5_store_creds_heimdal_pre_0_7(sp, creds);
 	krb5_storage_free(sp);
     }
     fcc_unlock(context, fd);