diff --git a/appl/kx/kx.c b/appl/kx/kx.c
index 35191421f..220a955cb 100644
--- a/appl/kx/kx.c
+++ b/appl/kx/kx.c
@@ -100,7 +100,7 @@ usr2handler (int sig)
 
 static int
 connect_host (char *host, char *user, des_cblock *key,
-	      des_key_schedule schedule, int passivep)
+	      des_key_schedule schedule, int passivep, int port)
 {
      CREDENTIALS cred;
      KTEXT_ST text;
@@ -128,7 +128,7 @@ connect_host (char *host, char *user, des_cblock *key,
 
      memset (&thataddr, 0, sizeof(thataddr));
      thataddr.sin_family = AF_INET;
-     thataddr.sin_port   = k_getportbyname ("kx", "tcp", htons(KX_PORT));
+     thataddr.sin_port   = port;
      for(p = hostent->h_addr_list; *p; ++p) {
 	 int one = 1;
 
@@ -174,6 +174,8 @@ connect_host (char *host, char *user, des_cblock *key,
 		   krb_get_err_text(status));
 	  return -1;
      }
+
+     memcpy(key, cred.session, sizeof(des_cblock));
      strncpy (name, user, sizeof(name));
      name[sizeof(name) - 1] = '\0';
      if (krb_net_write (s, name, sizeof(name)) != sizeof(name)) {
@@ -211,28 +213,9 @@ connect_host (char *host, char *user, des_cblock *key,
 	  return -1;
      }
 
-     memcpy(key, cred.session, sizeof(des_cblock));
      return s;
 }
 
-static int
-active (int fd, char *host, char *user,
-	des_cblock *iv, des_key_schedule schedule)
-{
-     int kxd;
-     u_char zero = 0;
-
-     kxd = connect_host (host, user, iv, schedule, 0); /* XXX */
-     if (kxd < 0)
-	  return 1;
-     if (krb_net_write (kxd, &zero, sizeof(zero)) != sizeof(zero)) {
-	  fprintf (stderr, "%s: write: %s\n", prog,
-		   strerror(errno));
-	  return 1;
-     }
-     return copy_encrypted (fd, kxd, iv, schedule);
-}
-
 /*
  * Get rid of the cookie that we were sent and get the correct one
  * from our own cookie file instead.
@@ -311,159 +294,185 @@ start_session(int xserver, int fd, des_cblock *iv,
      return copy_encrypted (xserver, fd, iv, schedule);
 }
 
-static int
-passive (int fd, char *host, char *user, des_cblock *iv,
-	 des_key_schedule schedule)
+static void
+status_output (int debugp)
 {
-     int xserver;
-
-     xserver = connect_local_xsocket (0);
-     if (xserver < 0)
-	  return 1;
-     return start_session (xserver, fd, iv, schedule);
+    if(debugp)
+	printf ("%u\t%s\t%s\n", (unsigned)getpid(), display, xauthfile);
+    else {
+	pid_t pid;
+	
+	pid = fork();
+	if (pid < 0) {
+	    fprintf (stderr, "%s: fork: %s\n", prog, strerror(errno));
+	    exit (1);
+	} else if (pid > 0) {
+	    printf ("%u\t%s\t%s\n", (unsigned)pid, display, xauthfile);
+	    exit (0);
+	} else {
+	    fclose(stdout);
+	}
+    }
 }
 
 /*
- * Connect to the given host.
- * Iff passivep, give it a port number to call you back and then wait.
- * Else, listen on a local display and then connect to the remote host
- * when a local client gets connected.
+ *
  */
 
 static int
-doit (char *host, char *user, int passivep, int debugp, int tcpp)
+doit_passive (char *host, char *user, int debugp, int port)
+{
+     des_key_schedule schedule;
+     des_cblock key;
+     int otherside;
+
+     otherside = connect_host (host, user, &key, schedule, 1, port);
+     if (otherside < 0)
+	 return 1;
+     status_output (debugp);
+     for (;;) {
+	 char tmp[6];
+	 pid_t child;
+	 int i;
+
+	 i = krb_net_read (otherside, tmp, sizeof(tmp));
+	 if (i < 0) {
+	     fprintf (stderr, "%s: read: %s\n", prog, strerror(errno));
+	     return 1;
+	 } else if (i == 0)
+	     return 0;
+	 ++nchild;
+	 child = fork ();
+	 if (child < 0) {
+	     fprintf (stderr, "%s: fork: %s\n", prog,
+		      strerror(errno));
+	     continue;
+	 } else if (child == 0) {
+	     struct sockaddr_in addr;
+	     int addrlen = sizeof(addr);
+	     int fd;
+	     int one = 1;
+	     int port;
+	     int xserver;
+
+	     if (getpeername (otherside, (struct sockaddr *)&addr,
+			      &addrlen) < 0) {
+		 fprintf (stderr, "%s: getpeername: %s\n", prog,
+			  strerror(errno));
+		 exit (1);
+	     }
+	     close (otherside);
+
+	     sscanf (tmp, "%d", &port);
+	     addr.sin_port = htons(port);
+	     fd = socket (AF_INET, SOCK_STREAM, 0);
+	     if (fd < 0) {
+		 fprintf (stderr, "%s: socket: %s\n", prog, strerror(errno));
+		 exit (1);
+	     }
+#if defined(TCP_NODELAY) && defined(HAVE_SETSOCKOPT)
+	     setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&one,
+			 sizeof(one));
+#endif
+	     if (connect (fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+		 fprintf (stderr, "%s: connect: %s\n", prog, strerror(errno));
+		 exit (1);
+	     }
+	     xserver = connect_local_xsocket (0);
+	     if (xserver < 0)
+		 return 1;
+	     return start_session (xserver, fd, &key, schedule);
+	 } else {
+	 }
+     }
+}
+
+/*
+ *
+ */
+
+static int
+doit_active (char *host, char *user, int debugpp, int tcpp, int port)
 {
      des_key_schedule schedule;
      des_cblock key;
      int rendez_vous1 = 0, rendez_vous2 = 0;
-     int (*fn)(int fd, char *host, char *user, des_cblock *iv,
-	       des_key_schedule schedule);
-     pid_t pid;
 
-     if (passivep) {
-	  struct sockaddr_in newaddr;
-	  int addrlen;
-	  int otherside;
-
-	  otherside = connect_host (host, user, &key, schedule, passivep);
-	  if (otherside < 0)
-	       return 1;
-
-	  rendez_vous1 = socket (AF_INET, SOCK_STREAM, 0);
-	  if (rendez_vous1 < 0) {
-	       fprintf (stderr, "%s: socket failed: %s\n", prog,
-			strerror(errno));
-	       return 1;
-	  }
-	  memset (&newaddr, 0, sizeof(newaddr));
-	  if (bind (rendez_vous1, (struct sockaddr *)&newaddr,
-		    sizeof(newaddr)) < 0) {
-	       fprintf (stderr, "%s: bind: %s\n", prog, strerror(errno));
-	       return 1;
-	  }
-	  addrlen = sizeof(newaddr);
-	  if (getsockname (rendez_vous1, (struct sockaddr *)&newaddr,
-			   &addrlen) < 0) {
-	       fprintf (stderr, "%s: getsockname: %s\n", prog,
-			strerror(errno));
-	       return 1;
-	  }
-	  if (listen (rendez_vous1, SOMAXCONN) < 0) {
-	       fprintf (stderr, "%s: listen: %s\n", prog, strerror(errno));
-	       return 1;
-	  }
-	  {
-	      char tmp[6];
-
-	      sprintf (tmp, "%d", ntohs(newaddr.sin_port));
-	      if (krb_net_write (otherside, tmp, sizeof(tmp))
-		  != sizeof(tmp)) {
-		  fprintf (stderr, "%s: write: %s\n", prog, strerror(errno));
-		  return 1;
-	      }
-	  }
-	  /* close (otherside); */
-	  fn = passive;
-     } else {
-	  display_num = get_xsockets (&rendez_vous1,
-				      tcpp ? &rendez_vous2 : NULL);
-	  if (display_num < 0)
-	       return 1;
-	  strncpy(xauthfile, tempnam("/tmp", NULL), xauthfile_size);
-	  if (create_and_write_cookie (xauthfile, cookie, cookie_len))
-	      return 1;
-
-	  fn = active;
-     }
-     if(debugp)
-	 printf ("%u\t%s\t%s\n", (unsigned)getpid(), display, xauthfile);
-     else {
-	 pid = fork();
-	 if (pid < 0) {
-	     fprintf (stderr, "%s: fork: %s\n", prog, strerror(errno));
-	     return 1;
-	 } else if (pid > 0) {
-	     printf ("%u\t%s\t%s\n", (unsigned)pid, display, xauthfile);
-	     exit (0);
-	 } else {
-	     fclose(stdout);
-	 }
-     }
+     display_num = get_xsockets (&rendez_vous1,
+				 tcpp ? &rendez_vous2 : NULL);
+     if (display_num < 0)
+	 return 1;
+     strncpy(xauthfile, tempnam("/tmp", NULL), xauthfile_size);
+     if (create_and_write_cookie (xauthfile, cookie, cookie_len))
+	 return 1;
+     status_output (debugpp);
      for (;;) {
-	  fd_set fdset;
-	  pid_t child;
-	  int fd, thisfd;
-	  int zero = 0;
-	  int one = 1;
+	 fd_set fdset;
+	 pid_t child;
+	 int fd, thisfd;
+	 int zero = 0;
+	 int one = 1;
 
-	  FD_ZERO(&fdset);
-	  if (rendez_vous1)
-	      FD_SET(rendez_vous1, &fdset);
-	  if (rendez_vous2)
-	      FD_SET(rendez_vous2, &fdset);
-	  if (select(FD_SETSIZE, &fdset, NULL, NULL, NULL) <= 0)
-	      continue;
-	  if (rendez_vous1 && FD_ISSET(rendez_vous1, &fdset))
-	      thisfd = rendez_vous1;
-	  else if (rendez_vous2 && FD_ISSET(rendez_vous2, &fdset))
-	      thisfd = rendez_vous2;
-	  else
-	      continue;
+	 FD_ZERO(&fdset);
+	 if (rendez_vous1)
+	     FD_SET(rendez_vous1, &fdset);
+	 if (rendez_vous2)
+	     FD_SET(rendez_vous2, &fdset);
+	 if (select(FD_SETSIZE, &fdset, NULL, NULL, NULL) <= 0)
+	     continue;
+	 if (rendez_vous1 && FD_ISSET(rendez_vous1, &fdset))
+	     thisfd = rendez_vous1;
+	 else if (rendez_vous2 && FD_ISSET(rendez_vous2, &fdset))
+	     thisfd = rendez_vous2;
+	 else
+	     continue;
 
-	  fd = accept (thisfd, NULL, &zero);
-	  if (fd < 0)
-	       if (errno == EINTR)
-		    continue;
-	       else {
-		    fprintf (stderr, "%s: accept: %s\n", prog,
-			     strerror(errno));
-		    return 1;
-	       }
+	 fd = accept (thisfd, NULL, &zero);
+	 if (fd < 0)
+	     if (errno == EINTR)
+		 continue;
+	     else {
+		 fprintf (stderr, "%s: accept: %s\n", prog,
+			  strerror(errno));
+		 return 1;
+	     }
 #if defined(TCP_NODELAY) && defined(HAVE_SETSOCKOPT)
-	  setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&one, sizeof(one));
+	 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&one, sizeof(one));
 #endif
-	  ++nchild;
-	  child = fork ();
-	  if (child < 0) {
-	       fprintf (stderr, "%s: fork: %s\n", prog,
-			strerror(errno));
-	       continue;
-	  } else if (child == 0) {
-	       if (rendez_vous1)
-		   close (rendez_vous1);
-	       if (rendez_vous2)
-		   close (rendez_vous2);
-	       return (*fn)(fd, host, user, &key, schedule);
-	  } else {
-	       close (fd);
-	  }
+	 ++nchild;
+	 child = fork ();
+	 if (child < 0) {
+	     fprintf (stderr, "%s: fork: %s\n", prog,
+		      strerror(errno));
+	     continue;
+	 } else if (child == 0) {
+	     int kxd;
+	     u_char zero = 0;
+
+	     if (rendez_vous1)
+		 close (rendez_vous1);
+	     if (rendez_vous2)
+		 close (rendez_vous2);
+	     kxd = connect_host (host, user, &key, schedule, 0, port);
+	     if (kxd < 0)
+		 return 1;
+	     if (krb_net_write (kxd, &zero, sizeof(zero)) != sizeof(zero)) {
+		 fprintf (stderr, "%s: write: %s\n", prog,
+			  strerror(errno));
+		 return 1;
+	     }
+	     return copy_encrypted (fd, kxd, &key, schedule);
+	 } else {
+	     close (fd);
+	 }
      }
 }
 
 static void
 usage(void)
 {
-    fprintf (stderr, "Usage: %s [-d] [-t] [-l remoteuser] host\n", prog);
+    fprintf (stderr, "Usage: %s [-p port] [-d] [-t] [-l remoteuser] host\n",
+	     prog);
     exit (1);
 }
 
@@ -480,9 +489,10 @@ main(int argc, char **argv)
      char *disp, *user = NULL;
      int debugp = 0, tcpp = 0;
      int c;
+     int port = 0;
 
      prog = argv[0];
-     while((c = getopt(argc, argv, "tdl:")) != EOF) {
+     while((c = getopt(argc, argv, "tdl:p:")) != EOF) {
 	 switch(c) {
 	 case 'd' :
 	     debugp = 1;
@@ -493,6 +503,9 @@ main(int argc, char **argv)
 	 case 'l' :
 	     user = optarg;
 	     break;
+	 case 'p' :
+	     port = htons(atoi (optarg));
+	     break;
 	 case '?':
 	 default:
 	     usage();
@@ -512,11 +525,16 @@ main(int argc, char **argv)
 	  }
 	  user = strdup (p->pw_name);
      }
+     if (port == 0)
+	 port = k_getportbyname ("kx", "tcp", htons(KX_PORT));
      disp = getenv("DISPLAY");
      passivep = disp != NULL && 
        (*disp == ':' || strncmp(disp, "unix", 4) == 0);
      signal (SIGCHLD, childhandler);
      signal (SIGUSR1, usr1handler);
      signal (SIGUSR2, usr2handler);
-     return doit (argv[0], user, passivep, debugp, tcpp);
+     if (passivep)
+	 return doit_passive (argv[0], user, debugp, port);
+     else
+	 return doit_active  (argv[0], user, debugp, tcpp, port);
 }
diff --git a/appl/kx/kxd.c b/appl/kx/kxd.c
index 037cb8ec0..fef7ed78e 100644
--- a/appl/kx/kxd.c
+++ b/appl/kx/kxd.c
@@ -80,8 +80,7 @@ cleanup(void)
 }
 
 static int
-recv_conn (int sock, des_cblock *key, des_key_schedule schedule,
-	   struct sockaddr_in *retaddr)
+recv_conn (int sock, des_cblock *key, des_key_schedule schedule)
 {
      int status;
      KTEXT_ST ticket;
@@ -93,6 +92,7 @@ recv_conn (int sock, des_cblock *key, des_key_schedule schedule,
      char version[KRB_SENDAUTH_VLEN];
      u_char ok = 0;
      struct passwd *passwd;
+     char remotehost[MaxHostNameLen];
 
      addrlen = sizeof(thisaddr);
      if (getsockname (sock, (struct sockaddr *)&thisaddr, &addrlen) < 0 ||
@@ -105,6 +105,8 @@ recv_conn (int sock, des_cblock *key, des_key_schedule schedule,
 	  return 1;
      }
 
+     inaddr2str (thataddr.sin_addr, remotehost, sizeof(remotehost));
+
      k_getsockinst (sock, instance);
      status = krb_recvauth (KOPT_DO_MUTUAL, sock, &ticket, "rcmd", instance,
 			    &thataddr, &thisaddr, &auth, "", schedule,
@@ -113,6 +115,7 @@ recv_conn (int sock, des_cblock *key, des_key_schedule schedule,
 	 strncmp(version, KX_VERSION, KRB_SENDAUTH_VLEN) != 0) {
 	  return 1;
      }
+     memcpy(key, &auth.session, sizeof(des_cblock));
      if (krb_net_read (sock, user, sizeof(user)) != sizeof(user))
 	  return 1;
      passwd = k_getpwnam (user);
@@ -125,12 +128,16 @@ recv_conn (int sock, des_cblock *key, des_key_schedule schedule,
 	 setuid(passwd->pw_uid)) {
 	  return fatal (sock, "Cannot set uid");
      }
+     syslog (LOG_INFO, "from %s(%s): %s -> %s",
+	     remotehost,
+	     inet_ntoa(thataddr.sin_addr),
+	     krb_unparse_name_long (auth.pname, auth.pinst, auth.prealm),
+	     user);
+
      umask(077);
      if (krb_net_write (sock, &ok, sizeof(ok)) != sizeof(ok))
 	  return 1;
 
-     memcpy(key, &auth.session, sizeof(des_cblock));
-     *retaddr = thataddr;
      return 0;
 }
 
@@ -175,26 +182,51 @@ start_session (int fd, int sock, des_cblock *key,
 }
 
 static int
-doit_conn (int fd, struct sockaddr_in *thataddr,
+doit_conn (int fd, int meta_sock,
 	   des_cblock *key, des_key_schedule schedule)
 {
-  int sock;
-  int one = 1;
+    int sock, sock2;
+    int one = 1;
+    struct sockaddr_in thisaddr;
+    int addrlen;
+    char tmp[6];
 
-  sock = socket (AF_INET, SOCK_STREAM, 0);
-  if (sock < 0) {
-    char msg[200];
-    sprintf (msg, "socket: %s", strerror(errno));
-    return fatal (sock, msg);
-  }
+    sock = socket (AF_INET, SOCK_STREAM, 0);
+    if (sock < 0) {
+	syslog (LOG_ERR, "socket: %m");
+	return 1;
+    }
 #if defined(TCP_NODELAY) && defined(HAVE_SETSOCKOPT)
-  setsockopt (sock, IPPROTO_TCP, TCP_NODELAY, (void *)&one, sizeof(one));
+    setsockopt (sock, IPPROTO_TCP, TCP_NODELAY, (void *)&one, sizeof(one));
 #endif
-  if (connect (sock, (struct sockaddr *)thataddr,
-	       sizeof(*thataddr)) < 0) {
-    abort ();
-  }
-  return start_session (fd, sock, key, schedule);
+    memset (&thisaddr, 0, sizeof(thisaddr));
+    if (bind (sock, (struct sockaddr *)&thisaddr, sizeof(thisaddr)) < 0) {
+	syslog (LOG_ERR, "bind: %m");
+	return 1;
+    }
+    addrlen = sizeof(thisaddr);
+    if (getsockname (sock, (struct sockaddr *)&thisaddr,
+		     &addrlen) < 0) {
+	syslog (LOG_ERR, "getsockname: %m");
+	return 1;
+    }
+    if (listen (sock, SOMAXCONN) < 0) {
+	syslog (LOG_ERR, "listen: %m");
+	return 1;
+    }
+    sprintf (tmp, "%d", ntohs(thisaddr.sin_port));
+    if (krb_net_write (meta_sock, tmp, sizeof(tmp)) != sizeof(tmp)) {
+	syslog (LOG_ERR, "write: %m");
+	return 1;
+    }
+    sock2 = accept (sock, (struct sockaddr *)&thisaddr, &addrlen);
+    if (sock2 < 0) {
+	syslog (LOG_ERR, "accept: %m");
+	return 1;
+    }
+    close (sock);
+    close (meta_sock);
+    return start_session (fd, sock2, key, schedule);
 }
 
 /*
@@ -217,12 +249,11 @@ static int
 doit(int sock, int tcpp)
 {
      u_char passivep;
-     struct sockaddr_in thataddr;
      des_key_schedule schedule;
      des_cblock key;
      int localx, tcpx;
 
-     if (recv_conn (sock, &key, schedule, &thataddr))
+     if (recv_conn (sock, &key, schedule))
 	  return 1;
      if (krb_net_read (sock, &passivep, sizeof(passivep)) != sizeof(passivep))
 	  return 1;
@@ -237,19 +268,11 @@ doit(int sock, int tcpp)
 	  if (krb_net_write (sock, display, display_size) != display_size)
 	       return 1;
 	  strncpy(xauthfile, tempnam("/tmp", NULL), xauthfile_size);
-	  if (krb_net_write (sock, xauthfile, xauthfile_size) !=
-	      xauthfile_size)
+	  if (krb_net_write (sock, xauthfile, xauthfile_size)
+	      != xauthfile_size)
 	       return 1;
 	  if(create_and_write_cookie (xauthfile, cookie, cookie_len))
 	       return 1;
-	  {
-	      char tmp[6];
-
-	      if(krb_net_read(sock, tmp, sizeof(tmp)) != sizeof(tmp))
-		  return -1;
-	      thataddr.sin_port = htons(atoi(tmp));
-	  }
-
 	  for (;;) {
 	       pid_t child;
 	       int fd;
@@ -280,16 +303,15 @@ doit(int sock, int tcpp)
 		   if (fd >= 0 && suspicious_address (fd, peer)) {
 		       close (fd);
 		       continue;
-		   }		       
+		   }
 	       } else
 		   continue;
 	       if (fd < 0)
 		    if (errno == EINTR)
 			 continue;
 		    else {
-			 char msg[200];
-			 sprintf (msg, "accept: %s\n", strerror (errno));
-			 return fatal (sock, msg);
+			syslog (LOG_ERR, "accept: %m");
+			return 1;
 		    }
 #if defined(TCP_NODELAY) && defined(HAVE_SETSOCKOPT)
 	       setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&one,
@@ -297,14 +319,13 @@ doit(int sock, int tcpp)
 #endif
 	       child = fork ();
 	       if (child < 0) {
-		    char msg[200];
-		    sprintf (msg, "fork: %s\n", strerror (errno));
-		    return fatal(sock, msg);
+		   syslog (LOG_ERR, "fork: %m");
+		   return 1;
 	       } else if (child == 0) {
 		    close (localx);
 		    if (tcpp)
 			 close (tcpx);
-		    return doit_conn (fd, &thataddr, &key, schedule);
+		    return doit_conn (fd, sock, &key, schedule);
 	       } else {
 		    close (fd);
 	       }
@@ -323,12 +344,12 @@ doit(int sock, int tcpp)
 static void
 usage (void)
 {
-     fprintf (stderr, "Usage: %s [-i] [-t]\n", prog);
+     fprintf (stderr, "Usage: %s [-i] [-t] [-p port]\n", prog);
      exit (1);
 }
 
 /*
- * xkd - receive a forwarded X conncection
+ * kxd - receive a forwarded X conncection
  */
 
 int
@@ -337,10 +358,11 @@ main (int argc, char **argv)
      int c;
      int no_inetd = 0;
      int tcpp = 0;
+     int port = 0;
 
      prog = argv[0];
 
-     while( (c = getopt (argc, argv, "it")) != EOF) {
+     while( (c = getopt (argc, argv, "itp:")) != EOF) {
 	  switch (c) {
 	  case 'i':
 	       no_inetd = 1;
@@ -348,6 +370,9 @@ main (int argc, char **argv)
 	  case 't':
 	       tcpp = 1;
 	       break;
+	  case 'p':
+	      port = htons(atoi (optarg));
+	      break;
 	  case '?':
 	  default:
 	       usage ();
@@ -355,7 +380,8 @@ main (int argc, char **argv)
      }
 
      if (no_inetd)
-	  mini_inetd (k_getportbyname("kx", "tcp", htons(KX_PORT)));
+	  mini_inetd (port ? port : k_getportbyname("kx", "tcp",
+						    htons(KX_PORT)));
      openlog(prog, LOG_PID|LOG_CONS, LOG_DAEMON);
      signal (SIGCHLD, childhandler);
      return doit(STDIN_FILENO, tcpp);