diff --git a/lib/krb5/build_auth.c b/lib/krb5/build_auth.c
index ddd2c1f84..688fd601b 100644
--- a/lib/krb5/build_auth.c
+++ b/lib/krb5/build_auth.c
@@ -31,7 +31,13 @@ krb5_build_authenticator (krb5_context context,
   gettimeofday(&tv, NULL);
   auth->cusec = tv.tv_usec;
   auth->ctime = tv.tv_sec;
+#if 0
   auth->subkey = NULL;
+#else
+  krb5_generate_subkey (context, &cred->session, &auth->subkey);
+  copy_EncryptionKey (auth->subkey,
+		      &auth_context->local_subkey);
+#endif
   if (auth_context->flags & KRB5_AUTH_CONTEXT_DO_SEQUENCE) {
     krb5_generate_seq_number (context,
 			      &cred->session,