diff --git a/src/etc/Makefile b/src/etc/Makefile
index 1f62a725..87493c1a 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.315 2012/03/16 22:42:51 sthen Exp $
+#	$OpenBSD: Makefile,v 1.316 2012/04/01 18:32:51 deraadt Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -48,7 +48,7 @@ BIN1+=	wsconsctl.conf
 BIN2=	motd
 
 # -r-xr-xr-x
-RCDAEMONS=	amd apmd bgpd bootparamd btd cron dhcpd dhcrelay dvmrpd \
+RCDAEMONS=	amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \
 		ftpd ftpproxy hostapd hotplugd httpd identd ifstated iked \
 		inetd isakmpd ldapd ldattach ldpd lpd mopd mrouted named nginx \
 		nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd relayd ripd \
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 66675811..deddcaa2 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.166 2012/03/05 10:43:42 dlg Exp $
+#	$OpenBSD: rc.conf,v 1.167 2012/04/01 18:32:51 deraadt Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 ldpd_flags=NO		# for normal use: ""
@@ -122,7 +122,7 @@ pkg_scripts=
 local_rcconf="/etc/rc.conf.local"
 
 unset inetd_flags rwhod_flags portmap_flags kdc_flags kadmind_flags
-unset kpasswdd_flags btd_flags nfsd_flags mountd_flags lockd_flags
+unset kpasswdd_flags nfsd_flags mountd_flags lockd_flags
 unset statd_flags amd_flags ypbind_flags sndiod_flags
 
 [ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line
@@ -146,7 +146,6 @@ fi
 : ${kdc_flags=$([ X"${krb5_master_kdc-NO}" = XYES -o X"${krb5_slave_kdc-NO}" = XYES ] || echo NO)}
 : ${kadmind_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)}
 : ${kpasswdd_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)}
-: ${btd_flags=$([ X"${bt-NO}" = XYES ] || echo NO)}
 : ${nfsd_flags=$([ X"${nfs_server-NO}" = XYES ] && echo "-tun 4" || echo NO)}
 : ${mountd_flags=$([ X"${nfs_server-NO}" = XYES ] || echo NO)}
 : ${lockd_flags=$([ X"${lockd-NO}" = XYES ] || echo NO)}
diff --git a/src/etc/rc.d/btd b/src/etc/rc.d/btd
deleted file mode 100644
index 5f806b1b..00000000
--- a/src/etc/rc.d/btd
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: btd,v 1.2 2011/07/08 04:29:54 ajacoutot Exp $
-
-daemon="/usr/sbin/btd"
-
-. /etc/rc.d/rc.subr
-
-pexp="btd: \[priv\]"
-rc_reload=NO
-
-rc_cmd $1