diff --git a/ChangeLog b/ChangeLog
index a9ec3aee4..5fc27418e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,12 @@
    - markus@cvs.openbsd.org 2001/11/08 17:49:53
      [ssh.1]
      mention setuid root requirements; noted by cnorris@csc.UVic.ca; ok stevesk@
+   - markus@cvs.openbsd.org 2001/11/08 20:02:24
+     [auth.c]
+     don't print ROOT in CAPS for the authentication messages, i.e.
+     	Accepted publickey for ROOT from 127.0.0.1 port 42734 ssh2
+     becomes
+     	Accepted publickey for root from 127.0.0.1 port 42734 ssh2
 
 20011109
  - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK)
@@ -6857,4 +6863,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1649 2001/11/12 00:05:38 djm Exp $
+$Id: ChangeLog,v 1.1650 2001/11/12 00:06:06 djm Exp $
diff --git a/auth.c b/auth.c
index 096fb32ae..2bf877d1d 100644
--- a/auth.c
+++ b/auth.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth.c,v 1.28 2001/10/03 10:01:20 markus Exp $");
+RCSID("$OpenBSD: auth.c,v 1.29 2001/11/08 20:02:24 markus Exp $");
 
 #ifdef HAVE_LOGIN_H
 #include <login.h>
@@ -208,7 +208,7 @@ auth_log(Authctxt *authctxt, int authenticated, char *method, char *info)
 	    authmsg,
 	    method,
 	    authctxt->valid ? "" : "illegal user ",
-	    authctxt->valid && authctxt->pw->pw_uid == 0 ? "ROOT" : authctxt->user,
+	    authctxt->user,
 	    get_remote_ipaddr(),
 	    get_remote_port(),
 	    info);