diff --git a/NOTES b/NOTES
index 45508ab..fcc5da5 100644
--- a/NOTES
+++ b/NOTES
@@ -72,7 +72,6 @@ it uses select(), I'm not sure how I would honor Thread.interrupt() or
 whatever.  It's not guaranteed to interrupt select(), and I'm not keen on
 adding an arbitrary timeout/polling feature to it.
 
-XXX - disable utmp/wtmp
 XXX - visit XXX in jni/interface.c
 XXX - allow user to specify parameters for dropbear
 XXX - convert UI to use proper preferences templates, and have ...->settings instead of putting it on the home screen
diff --git a/dropbear/svr-chansession.c b/dropbear/svr-chansession.c
index 63d3cdb..df43b35 100644
--- a/dropbear/svr-chansession.c
+++ b/dropbear/svr-chansession.c
@@ -306,10 +306,12 @@ static void closechansess(struct Channel *channel) {
 #endif
 
 	if (chansess->tty) {
+#if 0
 		/* write the utmp/wtmp login record */
 		li = chansess_login_alloc(chansess);
 		login_logout(li);
 		login_free_entry(li);
+#endif /* 0 */
 
 		pty_release(chansess->tty);
 		m_free(chansess->tty);
@@ -807,11 +809,13 @@ static int ptycommand(struct Channel *channel, struct ChanSess *chansess) {
 
 		close(chansess->slave);
 
+#if 0
 		/* write the utmp/wtmp login record - must be after changing the
 		 * terminal used for stdout with the dup2 above */
 		li = chansess_login_alloc(chansess);
 		login_login(li);
 		login_free_entry(li);
+#endif /* 0 */
 
 #ifdef DO_MOTD
 		if (svr_opts.domotd) {