4 files changed, 10 insertions, 4 deletions
diff --git a/login-utils/chfn.1 b/login-utils/chfn.1
index 9328cc82b..b63ce6831 100644
--- a/login-utils/chfn.1
+++ b/login-utils/chfn.1
@@ -38,6 +38,10 @@ program.  The Linux
 command will display four pieces of information that can be changed by
 .BR chfn :
 your real name, your work room and phone, and your home phone.
+
+.B chfn
+is used to change local entries only. Use ypchfn, lchfn or any other
+implementation for non-local entries.
 .SS COMMAND LINE
 Any of the four pieces of information can be specified on the command
 line.  If no information is given on the command line,
diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index df8cbea89..691c4f6f5 100644
--- a/login-utils/chfn.c
+++ b/login-utils/chfn.c
@@ -142,8 +142,7 @@ int main (int argc, char **argv) {
     }
 
     if (!(is_local(oldf.username))) {
-       fprintf (stderr, _("%s: can only change local entries; use yp%s instead.\n"),
-           whoami, whoami);
+       fprintf (stderr, _("%s: can only change local entries.\n"), whoami);
        exit(1);
     }
 
diff --git a/login-utils/chsh.1 b/login-utils/chsh.1
index 6e00df311..bc9bc4323 100644
--- a/login-utils/chsh.1
+++ b/login-utils/chsh.1
@@ -27,6 +27,10 @@ is used to change your login shell.
 If a shell is not given on the command line,
 .B chsh
 prompts for one.
+
+.B chsh
+is used to change local entries only. Use ypchsh, lchsh or any other
+implementation for non-local entries.
 .SS VALID SHELLS
 .B chsh
 will accept the full pathname of any executable file on the system.
diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index 08b1e0d28..a893ef999 100644
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -128,8 +128,7 @@ main (int argc, char *argv[]) {
     }
 
     if (!(is_local(pw->pw_name))) {
-       fprintf (stderr, _("%s: can only change local entries; use yp%s instead.\n"),
-           whoami, whoami);
+       fprintf (stderr, _("%s: can only change local entries.\n"), whoami);
        exit(1);
     }