diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index 091ef6bc8732..98458bbe8e08 100644
--- a/usr.bin/ruptime/ruptime.1
+++ b/usr.bin/ruptime/ruptime.1
@@ -44,7 +44,7 @@
 .Sh DESCRIPTION
 .Nm Ruptime
 gives a status line like
-.Ar uptime
+.Xr uptime 1
 for each machine on the local network; these are formed from packets
 broadcast by each host on the network once every three minutes.
 .Pp
@@ -55,13 +55,12 @@ report has been received for 4 days are not shown in the list at all.
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl a
-Users idle an hour or more are not counted unless the
-.Fl a
-flag is given.
+Include all users.  By default, if a user hasn't typed to the system for
+an hour or more, then the user will be omitted from the output.
 .It Fl l
 Sort by load average.
 .It Fl r
-Reverses the sort order.
+Reverse the sort order.
 .It Fl t
 Sort by uptime.
 .It Fl u
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index ab275b901bbe..d573835b5480 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -31,16 +31,18 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
-
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1983, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)ruptime.c	8.2 (Berkeley) 4/5/94";
+#endif
+static const char rcsid[] =
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -83,7 +85,6 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	extern int optind;
 	struct dirent *dp;
 	struct hs *hsp;
 	struct whod *wd;
@@ -161,7 +162,7 @@ main(argc, argv)
 		++nhosts;
 	}
 	if (nhosts == 0)
-		errx(1, "no hosts in %s.", _PATH_RWHODIR);
+		errx(1, "no hosts in %s", _PATH_RWHODIR);
 
 	(void)time(&now);
 	qsort(hs, nhosts, sizeof(hs[0]), cmp);