diff --git a/libexec/fingerd/fingerd.8 b/libexec/fingerd/fingerd.8
index 948c15b6ed93..bf5154d93b19 100644
--- a/libexec/fingerd/fingerd.8
+++ b/libexec/fingerd/fingerd.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: fingerd.8,v 1.14 2002/09/12 01:40:54 kim Exp $
+.\"	$NetBSD: fingerd.8,v 1.15 2002/09/12 09:34:24 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -41,7 +41,7 @@
 .Nd remote user information server
 .Sh SYNOPSIS
 .Nm
-.Op Fl sluhmpSg8
+.Op Fl 8ghlmpSsu
 .Op Fl P Ar filename
 .Sh DESCRIPTION
 .Nm
@@ -99,22 +99,27 @@ The following options may be passed to
 as server program arguments in
 .Pa /etc/inetd.conf :
 .Bl -tag -width Ds
-.It Fl s
-Disable forwarding of queries to other remote hosts.
-.It Fl l
-Enable logging.
-The name of the host originating the query, and the actual request is reported via
-.Xr syslog 3
-at LOG_NOTICE priority.
-A request of the form `\\W' and `\\w' will return long output.
-Empty requests will return all currently logged in users.
-All other requests look for specific users.
-See RFC1196 for details.
-.It Fl u
-Queries without a user name are rejected.
+.It Fl 8
+Enable 8-bit output.
+.It Fl g
+Do not show any gecos information besides the users' real names.
 .It Fl h
 Display the name of the remote host in short mode,
 instead of the office location and office phone.
+.It Fl l
+Enable logging.
+The name of the host originating the query,
+and the actual request is reported via
+.Xr syslog 3
+at LOG_NOTICE priority.
+A request of the form
+.Sq \eW
+and
+.Sq \ew
+will return long output.
+Empty requests will return all currently logged in users.
+All other requests look for specific users.
+See RFC1196 for details.
 .It Fl m
 Prevent matching of
 .Ar user
@@ -124,6 +129,14 @@ is usually a login name; however, matching will also be done on the
 users' real names, unless the
 .Fl m
 option is supplied.
+.It Fl P
+Use an alternate program as the local information provider.
+The default local program executed by
+.Nm
+is
+.Xr finger 1 .
+By specifying a customized local server, this option allows a system manager
+to have more control over what information is provided to remote sites.
 .It Fl p
 Prevents
 .Xr finger 1
@@ -137,21 +150,10 @@ Prints user information in short mode, one line per user.
 This overrides the
 .Dq Pa Whois switch
 that may be passed in from the remote client.
-.It Fl g
-Do not show any gecos information besides the users' real names.
-.It Fl 8
-Enable 8-bit output.
-.It Fl P
-Use an alternate program as the local information provider.
-The default local program
-executed by
-.Nm
-is
-.Xr finger 1 .
-By specifying a customized local server,
-this option allows a system manager
-to have more control over what information is
-provided to remote sites.
+.It Fl s
+Disable forwarding of queries to other remote hosts.
+.It Fl u
+Queries without a user name are rejected.
 .El
 .Sh SEE ALSO
 .Xr finger 1 ,