diff --git a/etc/inetd.conf b/etc/inetd.conf
index a2a9e1d917ef..b59865784a2e 100644
--- a/etc/inetd.conf
+++ b/etc/inetd.conf
@@ -1,4 +1,4 @@
-#	$Id: inetd.conf,v 1.36 1999/07/16 15:41:13 sheldonh Exp $
+#	$Id: inetd.conf,v 1.37 1999/07/16 16:24:13 green Exp $
 #
 # Internet server configuration database
 #
@@ -67,13 +67,10 @@ ntalk	dgram	udp	wait	tty:tty	/usr/libexec/ntalkd	ntalkd
 #
 #auth	stream	tcp	nowait	root	internal
 #
-# Provide a real ident service internally
+# Provide internally a real "ident" service which provides ~/.fakeid support,
+# reports UNKNOWN as the operating system type and times out after 30 seconds.
 #
-#auth	stream	tcp	nowait	root	internal	auth -r
-#
-# As above, but enable ~/.fakeid support as well
-#
-#auth	stream	tcp	nowait	root	internal	auth -r -f
+#auth	stream	tcp	nowait	root	internal	auth -r -f -o UNKNOWN -t 30
 #
 # Example entry for an external ident server
 #
diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index 54578b65afe9..450e811ac888 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)inetd.8	8.3 (Berkeley) 4/13/94
-.\"	$Id: inetd.8,v 1.36 1999/07/16 15:41:14 sheldonh Exp $
+.\"	$Id: inetd.8,v 1.37 1999/07/23 15:37:39 green Exp $
 .\"
 .Dd February 7, 1996
 .Dt INETD 8
@@ -371,12 +371,14 @@ If the file
 .Pa .fakeid
 exists in the home directory of the identified user, report the username
 found in that file instead of the real username.
-.It Fl o Ar name
-Specify the operating system to be reported. It defaults to that returned by
-.Fn uname .
-.It Fl t Ar timeout
-Change the timeout from the default 10 seconds to a time specified in
-"sec" or "sec.usec" formats.
+.It Fl o Ar osname
+Use
+.Ar osname
+instead of the name of the system implementation
+returned by
+.Xr uname 3 .
+.It Fl t Ar sec[.usec]
+Specify a timeout for the service. The default timeout is 10.0 seconds.
 .El
 .Pp
 The