diff --git a/appl/popper/pop_pass.c b/appl/popper/pop_pass.c
index 6bb25470b..67fa3de41 100644
--- a/appl/popper/pop_pass.c
+++ b/appl/popper/pop_pass.c
@@ -43,7 +43,7 @@ krb5_verify_password (POP *p)
     krb5_principal client, server;
     krb5_creds creds;
 
-    ret = krb5_get_init_creds_opt_alloc (&get_options);
+    ret = krb5_get_init_creds_opt_alloc (p->context, &get_options);
     if (ret) {
 	pop_log(p, POP_PRIORITY, "krb5_get_init_creds_opt_init: %s",
 		krb5_get_err_text (p->context, ret));
diff --git a/kdc/hprop.c b/kdc/hprop.c
index 0b9f52d94..f64adf16e 100644
--- a/kdc/hprop.c
+++ b/kdc/hprop.c
@@ -517,7 +517,7 @@ get_creds(krb5_context context, krb5_ccache *cache)
 			      "kadmin", HPROP_NAME, NULL);
     if(ret) krb5_err(context, 1, ret, "krb5_make_principal");
 
-    ret = krb5_get_init_creds_opt_alloc(&init_opts);
+    ret = krb5_get_init_creds_opt_alloc(context, &init_opts);
     if(ret) krb5_err(context, 1, ret, "krb5_get_init_creds_opt_alloc");
     krb5_get_init_creds_opt_set_preauth_list(init_opts, &preauth, 1);
 
diff --git a/kpasswd/kpasswd-generator.c b/kpasswd/kpasswd-generator.c
index ce5f614f2..d33711a54 100644
--- a/kpasswd/kpasswd-generator.c
+++ b/kpasswd/kpasswd-generator.c
@@ -95,7 +95,7 @@ generate_requests (const char *filename, unsigned nreq)
 	krb5_data result_code_string, result_string;
 	char *old_pwd, *new_pwd;
 
-	krb5_get_init_creds_opt_alloc (&opt);
+	krb5_get_init_creds_opt_alloc (context, &opt);
 	krb5_get_init_creds_opt_set_tkt_life (opt, 300);
 	krb5_get_init_creds_opt_set_forwardable (opt, FALSE);
 	krb5_get_init_creds_opt_set_proxiable (opt, FALSE);
diff --git a/kpasswd/kpasswd.c b/kpasswd/kpasswd.c
index 57f0aa842..8a3ca1e17 100644
--- a/kpasswd/kpasswd.c
+++ b/kpasswd/kpasswd.c
@@ -144,7 +144,7 @@ main (int argc, char **argv)
     if (ret)
 	errx (1, "krb5_init_context failed: %d", ret);
   
-    ret = krb5_get_init_creds_opt_alloc (&opt);
+    ret = krb5_get_init_creds_opt_alloc (context, &opt);
     if (ret)
 	krb5_err(context, 1, ret, "krb5_get_init_creds_opt_alloc");
     
diff --git a/kuser/kinit.c b/kuser/kinit.c
index 79ab9fe28..3c8c701b2 100644
--- a/kuser/kinit.c
+++ b/kuser/kinit.c
@@ -415,7 +415,7 @@ get_new_tickets(krb5_context context,
 
     memset(&cred, 0, sizeof(cred));
 
-    ret = krb5_get_init_creds_opt_alloc (&opt);
+    ret = krb5_get_init_creds_opt_alloc (context, &opt);
     if (ret)
 	krb5_err(context, 1, ret, "krb5_get_init_creds_opt_alloc");
     
diff --git a/kuser/kverify.c b/kuser/kverify.c
index b33ba92b1..0e47b9061 100644
--- a/kuser/kverify.c
+++ b/kuser/kverify.c
@@ -81,7 +81,7 @@ main(int argc, char **argv)
     if (ret)
 	errx (1, "krb5_init_context failed: %d", ret);
 
-    ret = krb5_get_init_creds_opt_alloc (&get_options);
+    ret = krb5_get_init_creds_opt_alloc (context, &get_options);
     if (ret)
 	krb5_err(context, 1, ret, "krb5_get_init_creds_opt_alloc");
 
diff --git a/lib/gssapi/acquire_cred.c b/lib/gssapi/acquire_cred.c
index b14173622..77cb415e5 100644
--- a/lib/gssapi/acquire_cred.c
+++ b/lib/gssapi/acquire_cred.c
@@ -117,7 +117,7 @@ static OM_uint32 acquire_initiator_cred
 	kret = get_keytab(&keytab);
 	if (kret)
 	    goto end;
-	kret = krb5_get_init_creds_opt_alloc(&opt);
+	kret = krb5_get_init_creds_opt_alloc(gssapi_krb5_context, &opt);
 	if (ret)
 	    goto end;
 	kret = krb5_get_init_creds_keytab(gssapi_krb5_context, &cred,
diff --git a/lib/gssapi/krb5/acquire_cred.c b/lib/gssapi/krb5/acquire_cred.c
index b14173622..77cb415e5 100644
--- a/lib/gssapi/krb5/acquire_cred.c
+++ b/lib/gssapi/krb5/acquire_cred.c
@@ -117,7 +117,7 @@ static OM_uint32 acquire_initiator_cred
 	kret = get_keytab(&keytab);
 	if (kret)
 	    goto end;
-	kret = krb5_get_init_creds_opt_alloc(&opt);
+	kret = krb5_get_init_creds_opt_alloc(gssapi_krb5_context, &opt);
 	if (ret)
 	    goto end;
 	kret = krb5_get_init_creds_keytab(gssapi_krb5_context, &cred,
diff --git a/lib/kadm5/init_c.c b/lib/kadm5/init_c.c
index f90cfd72b..64ac58b2c 100644
--- a/lib/kadm5/init_c.c
+++ b/lib/kadm5/init_c.c
@@ -144,7 +144,7 @@ get_new_cache(krb5_context context,
     krb5_get_init_creds_opt *opt;
     krb5_ccache id;
     
-    ret = krb5_get_init_creds_opt_alloc (&opt);
+    ret = krb5_get_init_creds_opt_alloc (context, &opt);
     if (ret)
 	return ret;
 
diff --git a/lib/kadm5/ipropd_slave.c b/lib/kadm5/ipropd_slave.c
index be375a177..6aa643105 100644
--- a/lib/kadm5/ipropd_slave.c
+++ b/lib/kadm5/ipropd_slave.c
@@ -89,7 +89,7 @@ get_creds(krb5_context context, const char *keytab_str,
 				   KRB5_NT_SRV_HST, &client);
     if (ret) krb5_err(context, 1, ret, "krb5_sname_to_principal");
 
-    ret = krb5_get_init_creds_opt_alloc(&init_opts);
+    ret = krb5_get_init_creds_opt_alloc(context, &init_opts);
     if (ret) krb5_err(context, 1, ret, "krb5_get_init_creds_opt_alloc");
 
     asprintf (&server, "%s/%s", IPROP_NAME, host);
diff --git a/lib/krb5/verify_user.c b/lib/krb5/verify_user.c
index c710408ed..f66a95746 100644
--- a/lib/krb5/verify_user.c
+++ b/lib/krb5/verify_user.c
@@ -139,7 +139,7 @@ verify_user_opt_int(krb5_context context,
     krb5_get_init_creds_opt *opt;
     krb5_creds cred;
 
-    ret = krb5_get_init_creds_opt_alloc (&opt);
+    ret = krb5_get_init_creds_opt_alloc (context, &opt);
     if (ret)
 	return ret;
     krb5_get_init_creds_opt_set_default_flags(context, NULL,