diff --git a/src/etc/Makefile b/src/etc/Makefile
index 3fd147ae..ba3a9a7c 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.66 1997/09/03 23:50:55 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.67 1997/09/04 01:12:22 deraadt Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	US/Pacific
@@ -17,7 +17,7 @@ BIN1=	aliases bootptab changelist ccd.conf csh.cshrc csh.login csh.logout \
 	hosts.equiv hosts.lpd ifaliases inetd.conf ipf.rules ksh.kshrc \
 	locate.rc man.conf monthly motd mrouted.conf myname nat.rules \
 	netstart networks newsyslog.conf passwd.conf phones printcap \
-	protocols rbootd.conf rc rc.local rc.securelevel remote rpc security \
+	protocols rbootd.conf rc rc.conf rc.local rc.securelevel remote rpc security \
 	services shells syslog.conf weekly etc.${MACHINE}/disktab
 
 # -rw-rw-r--
diff --git a/src/etc/netstart b/src/etc/netstart
index 4547450f..f138f7eb 100644
--- a/src/etc/netstart
+++ b/src/etc/netstart
@@ -1,45 +1,9 @@
 #!/bin/sh -
 #
-#	$OpenBSD: netstart,v 1.28 1997/08/25 20:50:37 millert Exp $
+#	$OpenBSD: netstart,v 1.29 1997/09/04 01:12:23 deraadt Exp $
 
-# set these to "NO" to turn them off.  otherwise, they're used as flags
-routed_flags=NO		# for 'normal' use: routed_flags=-q
-mrouted_flags=NO	# for 'normal' use: mrouted_flags=""
-rarpd_flags=NO		# for 'normal' use: rarpd_flags="-a"
-bootparamd_flags=NO	# for 'normal' use: bootparamd_flags=""
-rbootd_flags=NO		# for 'normal' use: rbootd_flags=""
-sendmail_flags=NO	# for 'normal' use: sendmail_flags="-bd -q30m"
-named_flags=NO		# for 'normal' use: named_flags=""
-timed_flags=NO		# for 'normal' use: timed_flags=""
-photurisd_flags=""      # for 'normal' use: photurisd_flags=""
-
-# set the following to "YES" to turn them on
-rwhod=NO
-nfs_server=NO
-nfs_client=NO
-lockd=NO
-gated=NO
-kerberos_server=NO
-amd=NO
-ipfilter=NO
-nat=NO
-portmap=YES			# almost always needed
-inetd=YES			# almost always needed
-lpd=NO				# printing daemons
-check_quotas=YES		# NO may be desireable in some YP environments
-
-# miscellaneous other flags
-# only used if the appropriate server is marked YES above
-gated_flags=
-ypserv_flags=			# E.g. -1 for YP v1, -d for DNS etc
-yppasswdd_flags=		# "-d /etc/yp" if passwd files is in /etc/yp
-nfsd_flags="-tun 4"		# Crank the 4 for a busy fileserver
-amd_dir=/tmp_mnt		# AMD's mount directory
-amd_master=/etc/amd/master	# AMD 'master' map
-ipfilter_rules=/etc/ipf.rules	# Rules for IP packet filtering
-nat_rules=/etc/nat.rules	# Rules for Network Address Translation
-ipmon_flags=-s			# To disable logging, use ipmon_flags=NO
-rfc1323=YES			# TCP RFC1323 extensions (disable if tcp is slow)
+# pick up option configuration
+. /etc/rc.conf
 
 # /etc/myname contains my symbolic name
 #
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
new file mode 100644
index 00000000..5c5da710
--- /dev/null
+++ b/src/etc/rc.conf
@@ -0,0 +1,42 @@
+#!/bin/sh -
+#
+#	$OpenBSD: rc.conf,v 1.1 1997/09/04 01:12:24 deraadt Exp $
+
+# set these to "NO" to turn them off.  otherwise, they're used as flags
+routed_flags=NO		# for 'normal' use: routed_flags=-q
+mrouted_flags=NO	# for 'normal' use: mrouted_flags=""
+rarpd_flags=NO		# for 'normal' use: rarpd_flags="-a"
+bootparamd_flags=NO	# for 'normal' use: bootparamd_flags=""
+rbootd_flags=NO		# for 'normal' use: rbootd_flags=""
+sendmail_flags=NO	# for 'normal' use: sendmail_flags="-bd -q30m"
+named_flags=NO		# for 'normal' use: named_flags=""
+timed_flags=NO		# for 'normal' use: timed_flags=""
+photurisd_flags=""      # for 'normal' use: photurisd_flags=""
+
+# set the following to "YES" to turn them on
+rwhod=NO
+nfs_server=NO
+nfs_client=NO
+lockd=NO
+gated=NO
+kerberos_server=NO
+amd=NO
+ipfilter=NO
+nat=NO
+portmap=YES			# almost always needed
+inetd=YES			# almost always needed
+lpd=NO				# printing daemons
+check_quotas=YES		# NO may be desireable in some YP environments
+
+# miscellaneous other flags
+# only used if the appropriate server is marked YES above
+gated_flags=
+ypserv_flags=			# E.g. -1 for YP v1, -d for DNS etc
+yppasswdd_flags=		# "-d /etc/yp" if passwd files is in /etc/yp
+nfsd_flags="-tun 4"		# Crank the 4 for a busy fileserver
+amd_dir=/tmp_mnt		# AMD's mount directory
+amd_master=/etc/amd/master	# AMD 'master' map
+ipfilter_rules=/etc/ipf.rules	# Rules for IP packet filtering
+nat_rules=/etc/nat.rules	# Rules for Network Address Translation
+ipmon_flags=-s			# To disable logging, use ipmon_flags=NO
+rfc1323=YES			# TCP RFC1323 extensions (disable if tcp is slow)