diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index c9d2470f30b5..5b2feb6c2bdb 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -17,6 +17,13 @@ DHCLIENTDIR=		${DEVDDIR}
 DHCLIENT+=		dhclient.conf
 DHCLIENTPACKAGE=	dhclient
 
+.if ${MK_BLUETOOTH} != "no"
+CONFGROUPS+=		BLUETOOTH
+BLUETOOTHDIR=		${DEVDDIR}
+BLUETOOTH+=		bluetooth.conf
+BLUETOOTHPACKAGE=	bluetooth
+.endif
+
 .if ${MK_HYPERV} != "no"
 CONFGROUPS+=	HYPERV
 HYPERVDIR=${DEVDDIR}
diff --git a/sbin/devd/bluetooth.conf b/sbin/devd/bluetooth.conf
new file mode 100644
index 000000000000..29bd51e36fca
--- /dev/null
+++ b/sbin/devd/bluetooth.conf
@@ -0,0 +1,9 @@
+# When a USB Bluetooth dongle appears, activate it
+attach 100 {
+	device-name "ubt[0-9]+";
+	action "service bluetooth quietstart $device-name";
+};
+detach 100 {
+	device-name "ubt[0-9]+";
+	action "service bluetooth quietstop $device-name";
+};
diff --git a/sbin/devd/devd.conf b/sbin/devd/devd.conf
index f7a8ea7ac8aa..43596fb9a9d5 100644
--- a/sbin/devd/devd.conf
+++ b/sbin/devd/devd.conf
@@ -69,16 +69,6 @@ detach 100 {
 	device-name "ed50";
 };
 
-# When a USB Bluetooth dongle appears, activate it
-attach 100 {
-	device-name "ubt[0-9]+";
-	action "service bluetooth quietstart $device-name";
-};
-detach 100 {
-	device-name "ubt[0-9]+";
-	action "service bluetooth quietstop $device-name";
-};
-
 # Firmware downloader for Atheros AR3011 based USB Bluetooth devices
 #attach 100 {
 #	match "vendor" "0x0cf3";