diff --git a/src/etc/rc b/src/etc/rc
index d86621c3..a6c4ed71 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.319 2008/10/03 14:25:11 deraadt Exp $
+#	$OpenBSD: rc,v 1.320 2008/11/27 00:52:06 uwe Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -675,6 +675,13 @@ if [ X"${hostapd_flags}" != X"NO" ]; then
 	echo -n ' hostapd';		/usr/sbin/hostapd ${hostapd_flags};
 fi
 
+if [ X"${bt}" != X"NO" ]; then
+	echo -n ' btd';			/usr/sbin/btd
+	if [ -f ${bt_rules} ]; then
+		btctl -f ${bt_rules}
+	fi
+fi
+
 if [ X"${rwhod}" = X"YES" ]; then
 	echo -n ' rwhod';		rwhod
 fi
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 6512af4f..59fb3d8d 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.130 2008/06/09 22:21:49 mbalmer Exp $
+#	$OpenBSD: rc.conf,v 1.131 2008/11/27 00:52:06 uwe Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 ripd_flags=NO		# for normal use: ""
@@ -70,6 +70,7 @@ lockd=NO
 amd=NO
 pf=NO			# Packet filter / NAT
 ipsec=NO		# IPsec
+bt=NO			# Bluetooth
 portmap=NO		# Note: inetd(8) rpc services need portmap too
 inetd=YES		# almost always needed
 check_quotas=YES	# NO may be desirable in some YP environments
@@ -95,6 +96,7 @@ amd_master=/etc/amd/master	# AMD 'master' map
 syslogd_flags=			# add more flags, ie. "-u -a /chroot/dev/log"
 pf_rules=/etc/pf.conf		# Packet filter rules file
 ipsec_rules=/etc/ipsec.conf	# IPsec rules file
+bt_rules=/etc/bt.conf		# Bluetooth rules file
 pflogd_flags=			# add more flags, ie. "-s 256"
 afsd_flags=			# Flags passed to afsd
 shlib_dirs=			# extra directories for ldconfig, separated