diff --git a/etc/rc.conf b/etc/rc.conf
index 8874b0297d3b..0f93d2075464 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,4 +1,4 @@
-#	$NetBSD: rc.conf,v 1.5 1997/03/17 00:05:11 cjs Exp $
+#	$NetBSD: rc.conf,v 1.6 1997/03/23 07:57:24 cjs Exp $
 #
 # see rc.conf(5) for more information.
 
@@ -10,40 +10,53 @@
 # `DEFAULT' enables a program with the default flags (as listed).
 # Any other string is used as a set of flags.
 
-ipfilter=NO		# YES or NO.
-lkm_init=YES		# YES or NO.
-syslogd_flags=DEFAULT	# default: ""
-named_flags=NO		# default: ""
-portmap=YES		# YES or NO; normally required.
-ypserv_flags=NO		# default: "-d"
-ypbind_flags=NO		# default: ""
-yppasswdd_flags=NO	# default: ""
-bootparamd_flags=NO	# default: ""
-nfs_server=NO		# YES or NO.
-nfsd_flags=DEFAULT	# default: "-tun 4"
-mountd_flags=DEFAULT	# default: ""
-nfs_client=NO		# YES or NO.
-nfsiod_flags=DEFAULT	# default: "-n 4"
-statd_flags=NO		# default: ""
-lockd_flags=NO		# default: ""
-amd_flags=NO		# default: "-l syslog -x error,noinfo,nostats"
+# Programs run on boot
+savecore_flags=DEFAULT		# default: ""
+lkm_init=YES			# YES or NO.
+ipfilter=NO			# YES or NO.
+
+# Daemons required for other daemons
+inetd_flags=DEFAULT		# default: ""; use "-l" for libwrap logging
+portmap=YES			# YES or NO; normally required.
+
+# Commonly used daemons
+update_flags=DEFAULT		# default: "30"
+syslogd_flags=DEFAULT		# default: ""
+timed_flags=NO			# default: ""
+xntpd_flags=NO			# default: ""
+sendmail_flags=NO		# default: "-bd -q30m"
+named_flags=NO			# default: ""
+lpd_flags=DEFAULT		# default: ""
+
+# Routing Daemons
+routed_flags=DEFAULT		# default: "-q"
+gated_flags=NO			# default: "" (not distributed with NetBSD)
+mrouted_flags=NO		# default: ""
+
+# Daemons used to boot other machines over a network
+rarpd_flags=NO			# default: "-a"
+bootparamd_flags=NO		# default: ""
+dhcpd_flags=NO			# default: ""
+rbootd_flags=NO			# default: ""
+mopd_flags=NO			# default: "-a"
+
+# YP (NIS) daemons
+ypbind_flags=NO			# default: ""
+ypserv_flags=NO			# default: "-d"
+yppasswdd_flags=NO		# default: ""
+
+# Network file system daemons
+nfs_client=NO			# YES or NO.
+nfsiod_flags=DEFAULT		# default: "-n 4"
+nfs_server=NO			# YES or NO.
+mountd_flags=DEFAULT		# default: ""
+nfsd_flags=DEFAULT		# default: "-tun 4"
+lockd_flags=NO			# default: ""
+statd_flags=NO			# default: ""
+amd_flags=NO			# default: "-l syslog -x error,noinfo,nostats"
 amd_dir=/amd			# AMD's mount directory
 amd_master=/etc/amd/master	# AMD 'master' map
-savecore_flags=DEFAULT	# default: ""
-update_flags=DEFAULT	# default: "30"
-# NOTE: gated is not distributed with NetBSD.
-gated_flags=NO		# default: ""
-routed_flags=DEFAULT	# default: "-q"
-mrouted_flags=NO	# default: ""
-timed_flags=NO		# default: ""
-xntpd_flags=NO		# default: ""
-dhcpd_flags=NO		# default: ""
-rwhod=NO		# YES or NO.
-lpd_flags=DEFAULT	# default: ""
-sendmail_flags=NO	# default: "-bd -q30m"
-rarpd_flags=NO		# default: "-a"
-rbootd_flags=NO		# default: ""
-mopd_flags=NO		# default: "-a"
-# NOTE: for libwrap logging, use `-l'.
-inetd_flags=DEFAULT	# default: ""
+
+# Other daemons:
+rwhod=NO			# YES or NO.
 kerberos_server=NO