Index: usbdevs
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/usbdevs,v
retrieving revision 1.711
diff -u -r1.711 usbdevs
--- usbdevs	1 Feb 2016 14:54:33 -0000	1.711
+++ usbdevs	14 Feb 2016 23:06:28 -0000
@@ -875,7 +875,13 @@
 product APPLE IPAD_MINI		0x12ab	Apple iPad Mini
 product APPLE ETHERNET		0x1402	Apple USB to Ethernet
 product APPLE BLUETOOTH2	0x8205	Bluetooth
-product APPLE BLUETOOTH_HOST_C	0x821f	Bluetooth USB Host Controller
+product APPLE BLUETOOTH_HOST_1	0x8213	Bluetooth USB Host Controller MacBookPro 7,1
+product APPLE BLUETOOTH_HOST_2	0x8215	Bluetooth USB Host Controller iMac 11,1
+product APPLE BLUETOOTH_HOST_3	0x821a	Bluetooth USB Host Controller MacBookPro 8,2
+product APPLE BLUETOOTH_HOST_4	0x821b	Bluetooth USB Host Controller MacBookAir 3,1 3,2
+product APPLE BLUETOOTH_HOST_5	0x821f	Bluetooth USB Host Controller MacBookAir 4,1
+product APPLE BLUETOOTH_HOST_6	0x8281	Bluetooth USB Host Controller MacMini 5,1
+product APPLE BLUETOOTH_HOST_7	0x828f	Bluetooth USB Host Controller MacBookAir 6,1
 product APPLE BLUETOOTH		0x8300	Bluetooth
 
 /* ArkMicroChips products */
Index: ubt.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/ubt.c,v
retrieving revision 1.51
diff -u -r1.51 ubt.c
--- ubt.c	20 May 2014 18:25:54 -0000	1.51
+++ ubt.c	14 Feb 2016 23:06:31 -0000
@@ -309,7 +309,19 @@
 } ubt_dev[] = {
 	{ { USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033NF },
 	  UMATCH_NONE },
-	{ { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_C },
+	{ { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_1 },
+	  UMATCH_VENDOR_PRODUCT },
+	{ { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_2 },
+	  UMATCH_VENDOR_PRODUCT },
+	{ { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_3 },
+	  UMATCH_VENDOR_PRODUCT },
+	{ { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_4 },
+	  UMATCH_VENDOR_PRODUCT },
+	{ { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_5 },
+	  UMATCH_VENDOR_PRODUCT },
+	{ { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_6 },
+	  UMATCH_VENDOR_PRODUCT },
+	{ { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_7 },
 	  UMATCH_VENDOR_PRODUCT },
 };
 #define ubt_lookup(vendor, product) \