diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index d77bcc0c2..882aa26ab 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -15643,10 +15643,10 @@ options}.
 
 
 @node whoami invocation
-@section @command{whoami}: Print effective user ID
+@section @command{whoami}: Print effective user name
 
 @pindex whoami
-@cindex effective user ID, printing
+@cindex effective user name, printing
 @cindex printing the effective user ID
 
 @command{whoami} prints the user name associated with the current
diff --git a/man/logname.x b/man/logname.x
index 997a1b7bc..83dbc066f 100644
--- a/man/logname.x
+++ b/man/logname.x
@@ -2,3 +2,5 @@
 logname \- print user\'s login name
 [DESCRIPTION]
 .\" Add any additional description here
+[SEE ALSO]
+getlogin(3)
diff --git a/man/whoami.x b/man/whoami.x
index 7ee371a3d..e7521e5cb 100644
--- a/man/whoami.x
+++ b/man/whoami.x
@@ -1,4 +1,4 @@
 [NAME]
-whoami \- print effective userid
+whoami \- print effective user name
 [DESCRIPTION]
 .\" Add any additional description here
diff --git a/src/logname.c b/src/logname.c
index cf98bfc66..8d1b0f18d 100644
--- a/src/logname.c
+++ b/src/logname.c
@@ -38,7 +38,7 @@ usage (int status)
     {
       printf (_("Usage: %s [OPTION]\n"), program_name);
       fputs (_("\
-Print the name of the current user.\n\
+Print the user's login name.\n\
 \n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);