diff --git a/appl/kx/kx.c b/appl/kx/kx.c
index 04eb7d74a..17b02bb0b 100644
--- a/appl/kx/kx.c
+++ b/appl/kx/kx.c
@@ -424,8 +424,7 @@ doit_active (char *host, char *user,
 	snprintf (display, display_size, "localhost:%u", display_num);
     else
 	snprintf (display, display_size, ":%u", display_num);
-    strncpy(xauthfile, tempnam("/tmp", NULL), xauthfile_size);
-    if (create_and_write_cookie (xauthfile, cookie, cookie_len))
+    if (create_and_write_cookie (xauthfile, xauthfile_size, cookie, cookie_len))
 	return 1;
     status_output (debugpp);
     for (;;) {
diff --git a/appl/kx/kxd.c b/appl/kx/kxd.c
index deb434a77..205972763 100644
--- a/appl/kx/kxd.c
+++ b/appl/kx/kxd.c
@@ -364,9 +364,9 @@ doit(int sock, int tcpp)
 	       snprintf (display, display_size, "localhost:%u", display_num);
 	  else
 	       snprintf (display, display_size, ":%u", display_num);
-	  strncpy(xauthfile, tempnam("/tmp", NULL), xauthfile_size);
-	  if(create_and_write_cookie (xauthfile, cookie, cookie_len))
-	       return 1;
+	  if(create_and_write_cookie (xauthfile, xauthfile_size, 
+				      cookie, cookie_len))
+	      return 1;
 
 	  p = msg;
 	  *p++ = ACK;