diff --git a/src/etc/rc b/src/etc/rc
index 7d42b72c..0cb77cc0 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.89 1998/09/19 02:31:51 todd Exp $
+#	$OpenBSD: rc,v 1.90 1998/10/12 03:02:57 art Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -220,6 +220,13 @@ if [ -d /var/crash ]; then
 	savecore /var/crash
 fi
 
+if [ "X${afs}" = X"YES" -a -c ${afs_device} -a -d ${afs_mount_point} ]; then
+	echo -n 'mounting afs:'
+	mount -t afs ${afs_device} ${afs_mount_point}
+	/usr/libexec/afsd ${afsd_flags} -d ${afs_device}
+	echo ' done.'
+fi
+
 if [ "X${check_quotas}" = X"YES" ]; then
 	echo -n 'checking quotas:'
 	quotacheck -a
@@ -464,3 +471,4 @@ if [ "X${xdm_flags}" != X"NO" ]; then
 fi
 
 exit 0
+
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 1642fd8c..4d24983c 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.31 1998/09/18 23:52:01 deraadt Exp $
+#	$OpenBSD: rc.conf,v 1.32 1998/10/12 03:02:57 art Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for 'normal' use: routed_flags="-q"
@@ -38,6 +38,7 @@ lpd=NO			# printing daemons
 check_quotas=YES	# NO may be desireable in some YP environments
 sshd=YES		# run sshd if it exists
 ntpd=YES		# run ntpd if it exists
+afs=NO			# mount and run afs
 
 # miscellaneous other flags
 # only used if the appropriate server is marked YES above
@@ -54,3 +55,6 @@ ipmon_flags=-Ds			# To disable logging, use ipmon_flags=NO
 syslogd_flags=			# add more flags, ie. -u -a /chroot/dev/log
 named_user=named		# Named should not run as root unless neccesary
 named_chroot=/var/named		# Where to chroot named if not empty
+afs_mount_point=/afs		# Mountpoint for AFS
+afs_device=/dev/xfs0		# Device used by afsd
+afsd_flags=-z			# Flags passed to afsd