diff --git a/ChangeLog b/ChangeLog
index 24546f573a..621de2b3c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-04  Ulrich Drepper  <drepper@redhat.com>
 
+	* sunrpc/key_call.c (__rpc_thread_key_cleanup): Also free
+	client->cl_auth.
+
 	* sunrpc/rpc_thread.c (__rpc_thread_destroy): Don't skip entire
 	cleanup for initial thread, just the free call on TVP.
 
diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c
index 77c0ce18b9..63293aefa5 100644
--- a/sunrpc/key_call.c
+++ b/sunrpc/key_call.c
@@ -552,8 +552,11 @@ __rpc_thread_key_cleanup (void)
 	struct key_call_private *kcp = RPC_THREAD_VARIABLE(key_call_private_s);
 
 	if (kcp) {
-		if (kcp->client)
+		if (kcp->client) {
+			if (kcp->client->cl_auth)
+				auth_destroy (kcp->client->cl_auth);
 			clnt_destroy(kcp->client);
+		}
 		free (kcp);
 	}
 }