--- rxvt-2.7.10/src/logging.c.orig	2002-12-16 09:33:04.000000000 +0900
+++ rxvt-2.7.10/src/logging.c	2003-06-08 13:08:52.000000000 +0900
@@ -60,6 +60,7 @@
 void
 rxvt_makeutent(rxvt_t *r, const char *pty, const char *hostname)
 {
+#if 0
 #ifdef HAVE_STRUCT_UTMP
     struct utmp    *ut = &(r->h->ut);
 #endif
@@ -211,6 +212,8 @@
     if (r->Options & Opt_loginShell)
 	rxvt_update_lastlog(RXVT_LASTLOG_FILE, pty, hostname);
 #endif
+#endif
+    addToUtmp(pty, NULL, r->cmd_fd);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -221,6 +224,7 @@
 void
 rxvt_cleanutent(rxvt_t *r)
 {
+#if 0
 #ifdef HAVE_STRUCT_UTMP
     struct utmp    *tmput, *ut = &(r->h->ut);
 #endif
@@ -300,6 +304,8 @@
 	pututxline(utx);
     endutxent();
 #endif
+#endif
+    removeFromUtmp();
 }
 
 /* ------------------------------------------------------------------------- */
--- rxvt-2.7.10/src/init.c.orig	2002-12-04 14:21:39.000000000 +0900
+++ rxvt-2.7.10/src/init.c	2003-06-08 13:09:26.000000000 +0900
@@ -858,6 +858,7 @@
 	rxvt_print_error("aborting");
 	exit(EXIT_FAILURE);
     }
+    rxvt_privileged_utmp(r, SAVE);
 }
 
 /*----------------------------------------------------------------------*/
@@ -1364,7 +1365,6 @@
 #endif
     r->num_fds++;		/* counts from 0 */
 
-    rxvt_privileged_utmp(r, SAVE);
     return cfd;
 }
 
--- rxvt-2.7.10/autoconf/Make.common.in.orig	2001-11-30 12:22:56.000000000 +0900
+++ rxvt-2.7.10/autoconf/Make.common.in	2003-06-08 13:08:52.000000000 +0900
@@ -68,7 +68,7 @@
 
 LIBTOOL = @LIBTOOL@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEBUG) $(DINCLUDE) $(XINC) -I$(basedir) -I$(srcdir) -I.
-LINK = $(CC) $(CFLAGS) $(LDFLAGS)
+LINK = $(CC) $(CFLAGS) $(LDFLAGS) -lutempter -lutil
 
 # End of common section of the Makefile
 #-------------------------------------------------------------------------