diff --git a/kuser/kinit.c b/kuser/kinit.c
index fd3d3caf5..0b22e7150 100644
--- a/kuser/kinit.c
+++ b/kuser/kinit.c
@@ -81,6 +81,7 @@ int pk_use_enckey	= 0;
 int pk_anon_fast_armor	= 0;
 char *gss_preauth_mech	= NULL;
 char *gss_preauth_name	= NULL;
+char *kdc_hostname	= NULL;
 static int canonicalize_flag = 0;
 static int enterprise_flag = 0;
 static int ok_as_delegate_flag = 0;
@@ -197,6 +198,9 @@ static struct getargs args[] = {
     { "gss-name",   0,	arg_string, &gss_preauth_name,
       NP_("use distinct GSS identity for pre-authentication", ""), NULL },
 
+    { "kdc-hostname",	0,  arg_string, &kdc_hostname,
+      NP_("KDC host name", ""), "hostname" },
+
 #ifndef NO_NTLM
     { "ntlm-domain",	0,  arg_string, &ntlm_domain,
       NP_("NTLM domain", ""), "domain" },
@@ -924,6 +928,14 @@ get_new_tickets(krb5_context context,
 	}
     }
 
+    if (kdc_hostname) {
+	ret = krb5_init_creds_set_kdc_hostname(context, ctx, kdc_hostname);
+	if (ret) {
+	    krb5_warn(context, ret, "krb5_init_creds_set_kdc_hostname");
+	    goto out;
+	}
+    }
+
     if (fast_armor_cache_string) {
 	krb5_ccache fastid = NULL;