diff --git a/src/etc/rc b/src/etc/rc
index dfb36aa3..45a7449c 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.238 2004/03/03 01:06:44 deraadt Exp $
+#	$OpenBSD: rc,v 1.239 2004/03/05 23:54:47 henning Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -442,6 +442,10 @@ if [ "X${mrouted_flags}" != X"NO" ]; then
 	echo -n ' mrouted';		mrouted $mrouted_flags
 fi
 
+if [ "X${bgpd_flags}" != X"NO" ]; then
+	echo -n ' bgpd';		/usr/sbin/bgpd $bgpd_flags
+fi
+
 # $dhcpd_flags is imported from /etc/rc.conf
 # If $dhcpd_flags == NO or /etc/dhcpd.conf doesn't exist, then dhcpd isn't run.
 if [ "X${dhcpd_flags}" != X"NO" -a -f /etc/dhcpd.conf ]; then
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 8a406d9c..21f8677c 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,11 +1,12 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.94 2004/02/26 07:33:08 beck Exp $
+#	$OpenBSD: rc.conf,v 1.95 2004/03/05 23:54:47 henning Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
 mrouted_flags=NO	# for normal use: "", if activated
 			# be sure to enable multicast_router below.
+bgpd_flags=NO		# for normal use: ""
 rarpd_flags=NO		# for normal use: "-a"
 bootparamd_flags=NO	# for normal use: ""
 rbootd_flags=NO		# for normal use: ""