diff --git a/lib/krb5/mk_req.c b/lib/krb5/mk_req.c
index e8af92773..aa7342f7c 100644
--- a/lib/krb5/mk_req.c
+++ b/lib/krb5/mk_req.c
@@ -45,7 +45,7 @@ krb5_mk_req(krb5_context context,
 	    krb5_ccache ccache,
 	    krb5_data *outbuf)
 {
-    krb5_error_code r;
+    krb5_error_code ret;
     krb5_creds this_cred, *cred;
     char **realms;
     krb5_data realm_data;
@@ -53,45 +53,41 @@ krb5_mk_req(krb5_context context,
 
     memset(&this_cred, 0, sizeof(this_cred));
 
-    r = krb5_cc_get_principal(context, ccache, &this_cred.client);
+    ret = krb5_cc_get_principal(context, ccache, &this_cred.client);
   
-    if(r)
-	return r;
+    if(ret)
+	return ret;
 
-    r = krb5_expand_hostname (context, hostname, &real_hostname);
-    if (r) {
+    ret = krb5_expand_hostname_realms (context, hostname,
+				       &real_hostname, &realms);
+    if (ret) {
 	krb5_free_principal (context, this_cred.client);
-	return r;
+	return ret;
     }
 
-    r = krb5_get_host_realm(context, real_hostname, &realms);
-    if (r) {
-	krb5_free_principal (context, this_cred.client);
-	return r;
-    }
     realm_data.length = strlen(*realms);
     realm_data.data   = *realms;
 
-    r = krb5_build_principal (context, &this_cred.server,
-			      strlen(*realms),
-			      *realms,
-			      service,
-			      real_hostname,
+    ret = krb5_build_principal (context, &this_cred.server,
+				strlen(*realms),
+				*realms,
+				service,
+				real_hostname,
 			      NULL);
     free (real_hostname);
     krb5_free_host_realm (context, realms);
 
-    if (r) {
+    if (ret) {
 	krb5_free_principal (context, this_cred.client);
-	return r;
+	return ret;
     }
     this_cred.times.endtime = 0;
     if (auth_context && *auth_context && (*auth_context)->keytype)
 	this_cred.session.keytype = (*auth_context)->keytype;
 
-    r = krb5_get_credentials (context, 0, ccache, &this_cred, &cred);
-    if (r)
-	return r;
+    ret = krb5_get_credentials (context, 0, ccache, &this_cred, &cred);
+    if (ret)
+	return ret;
 
     return krb5_mk_req_extended (context,
 				 auth_context,