diff --git a/src/etc/inetd.conf b/src/etc/inetd.conf
index cd47f51f..b7664dd3 100644
--- a/src/etc/inetd.conf
+++ b/src/etc/inetd.conf
@@ -1,9 +1,11 @@
-#	$OpenBSD: inetd.conf,v 1.18 1997/12/24 20:45:23 deraadt Exp $
+#	$OpenBSD: inetd.conf,v 1.19 1998/02/07 21:17:37 beck Exp $
 #
 # Internet server configuration database
 #
 ftp		stream	tcp	nowait	root	/usr/libexec/ftpd	ftpd -US
 telnet		stream	tcp	nowait	root	/usr/libexec/telnetd	telnetd -k
+#smtpd - store/forward smtp daemon - see /usr/share/smtpd before enabling
+#smtp		stream 	tcp 	nowait	root	/usr/libexec/smtpd	smtpd
 shell		stream	tcp	nowait	root	/usr/libexec/rshd	rshd -L
 login		stream	tcp	nowait	root	/usr/libexec/rlogind	rlogind
 #exec		stream	tcp	nowait	root	/usr/libexec/rexecd	rexecd
diff --git a/src/etc/rc b/src/etc/rc
index 46452006..5414f136 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.62 1998/02/06 00:06:00 deraadt Exp $
+#	$OpenBSD: rc,v 1.63 1998/02/07 21:17:37 beck Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -334,6 +334,13 @@ if [ "X${sendmail_flags}" != X"NO" -a -r /etc/sendmail.cf ]; then
 	echo -n ' sendmail';		/usr/sbin/sendmail ${sendmail_flags}
 fi
 
+# $smtpfwdd_flags is imported from /etc/rc.conf;
+# If $smtpfwdd_flags == NO, smtpfwdd isn't run.
+if [ "X${smtpfwdd_flags}" != X"NO" ]; then
+	echo -n ' smtpfwdd';	/usr/libexec/smtpfwdd ${smtpfwdd_flags}
+fi
+
+
 if [ X${inetd} = X"YES" ]; then
 	echo -n ' inetd';		inetd
 fi
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index b0ffec36..2becc64a 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.11 1998/02/07 20:51:50 deraadt Exp $
+#	$OpenBSD: rc.conf,v 1.12 1998/02/07 21:17:37 beck Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for 'normal' use: routed_flags="-q"
@@ -9,6 +9,7 @@ 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"
+smtpfwdd_flags=NO     # for 'normal' use: smtpfwdd_flags="", no -bd above.
 named_flags=NO		# for 'normal' use: named_flags=""
 timed_flags=NO		# for 'normal' use: timed_flags=""
 photurisd_flags=""	# for 'normal' use: photurisd_flags=""