diff --git a/lib/krb5/context.c b/lib/krb5/context.c
index cff75d8c3..cc5a2d5b8 100644
--- a/lib/krb5/context.c
+++ b/lib/krb5/context.c
@@ -232,6 +232,9 @@ krb5_init_context(krb5_context *context)
 
     *context = NULL;
 
+    /* should have a run_once */
+    bindtextdomain(HEIMDAL_TEXTDOMAIN, HEIMDAL_LOCALEDIR);
+
     p = calloc(1, sizeof(*p));
     if(!p)
 	return ENOMEM;
@@ -695,11 +698,20 @@ krb5_init_ets(krb5_context context)
 {
     if(context->et_list == NULL){
 	krb5_add_et_list(context, initialize_krb5_error_table_r);
+	bindtextdomain(COM_ERR_BINDDOMAIN_krb5, HEIMDAL_LOCALEDIR);
+
 	krb5_add_et_list(context, initialize_asn1_error_table_r);
+	bindtextdomain(COM_ERR_BINDDOMAIN_asn1, HEIMDAL_LOCALEDIR);
+
 	krb5_add_et_list(context, initialize_heim_error_table_r);
+	bindtextdomain(COM_ERR_BINDDOMAIN_heim, HEIMDAL_LOCALEDIR);
+
 	krb5_add_et_list(context, initialize_k524_error_table_r);
+	bindtextdomain(COM_ERR_BINDDOMAIN_k524, HEIMDAL_LOCALEDIR);
+
 #ifdef PKINIT
 	krb5_add_et_list(context, initialize_hx_error_table_r);
+	bindtextdomain(COM_ERR_BINDDOMAIN_hx, HEIMDAL_LOCALEDIR);
 #endif
     }
 }