diff --git a/etc/rc b/etc/rc
index bbe21cda3890..85a259922b50 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#	$NetBSD: rc,v 1.95 1997/10/10 09:37:54 drochner Exp $
+#	$NetBSD: rc,v 1.96 1997/11/11 02:28:58 jonathan Exp $
 #	originally from: @(#)rc	8.2 (Berkeley) 3/17/94
 
 # System startup script run by init on autoboot
@@ -14,7 +14,7 @@ trap : 2
 trap : 3	# shouldn't be needed
 
 export HOME=/
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin
+export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
 
 # Configure ccd devices.
 if [ -f /etc/ccd.conf ]; then
@@ -404,6 +404,11 @@ if checkyesno sendmail; then
 	fi
 fi
 
+# Start xfs before boot daemons, so its ready before client xterminals.
+if checkyesno xfs; then
+	echo -n ' xfs';			xfs $xfs_flags &
+fi
+
 if checkyesno rarpd; then
 	if [ -r /etc/ethers ]; then
 		echo -n ' rarpd';	rarpd $rarpd_flags
@@ -442,6 +447,10 @@ if checkyesno inetd; then
 	fi
 fi
 
+if checkyesno xdm; then
+	echo -n ' xdm';			xdm $xdm_flags
+fi
+
 echo '.'
 
 # Kerberos runs ONLY on the Kerberos server machine
diff --git a/etc/rc.conf b/etc/rc.conf
index 3431eee0b902..5d72850d27a1 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,4 +1,4 @@
-#	$NetBSD: rc.conf,v 1.22 1997/10/10 09:37:59 drochner Exp $
+#	$NetBSD: rc.conf,v 1.23 1997/11/11 02:29:00 jonathan Exp $
 #
 # see rc.conf(5) for more information.
 
@@ -57,6 +57,10 @@ dhcpd=NO		dhcpd_flags=""
 rbootd=NO		rbootd_flags=""
 mopd=NO			mopd_flags="-a"
 
+# X11 daemons:
+xfs=NO			xfs_flags=""		# X11 font server
+xdm=NO			xdm_flags=""		# x11 display manager
+
 # YP (NIS) daemons
 ypbind=NO		ypbind_flags=""
 ypserv=NO		ypserv_flags="-d"
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 86b1fffe268c..cfa19029573c 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -1,4 +1,4 @@
-.\"	$NetBSD: rc.conf.5,v 1.12 1997/10/10 05:40:07 mrg Exp $
+.\"	$NetBSD: rc.conf.5,v 1.13 1997/11/11 02:29:01 jonathan Exp $
 .\"
 .\" Copyright (c) 1996 Matthew R. Green
 .\" Copyright (c) 1997 Curt J. Sampson
@@ -391,6 +391,21 @@ Used only if
 is set to YES.
 .El
 .Pp
+X Window System daemons:
+.Bl -tag -width net_interfaces
+.It Sy xfs
+YES or NO.  Runs the
+.Xr xfs 1
+X11 font server, which supplies local X font files to X terminals.
+.It Sy xdm
+YES or NO.  Runs the
+.Xr xdm 1
+X display manager.
+
+These X daemons are available only with the optional X distribution of
+.Nx .
+.El
+.Pp
 Other daemons:
 .Bl -tag -width net_interfaces
 .It Sy apmd
@@ -405,11 +420,13 @@ to support the
 .Xr rwho 1
 command.
 .It Sy kerberos
-YES or NO.  Runs the kerberos server
+YES or NO.  Runs the kerberos  server
 .Xr kerberos 8
-and the kerberos admininstration server,
+and the kerberos  admininstration server,
 .Xr kadmind 8 .
 This should only be run on the kerberos master server.
+Both servers implement version IV of the Kerberos protocol, not the
+newer Kerberos version 5.
 The kerberos server is only available with the domestic distribution of
 .Nx .
 .El