diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index c66bcb0c3602..d35458c956a1 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -119,13 +119,10 @@ main(int argc, char *argv[])
 		fprintf(stderr, "Changing NIS password for %s\n",
 		    pwd->pw_name);
 		break;
-	case _PWF_HESIOD:
-		errx(1, "can't change Hesiod password");
-		break;
 	default:
-		/* specieist! */
-		errx(1, "can't change little green men's passwords (0x%x)",
-		    pwd->pw_fields);
+		/* XXX: Green men ought to be supported via PAM. */
+		errx(1, 
+	  "Sorry, `passwd' can only change passwords for local or NIS users.");
 	}
 
 #define pam_check(func) do { \