Index: usr.sbin/bluetooth/ath3kfw/ath3kfw.c
===================================================================
--- usr.sbin/bluetooth/ath3kfw/ath3kfw.c	(revision 248804)
+++ usr.sbin/bluetooth/ath3kfw/ath3kfw.c	(working copy)
@@ -59,6 +59,9 @@
 					 char const *firmware);
 static void	usage			(void);
 
+static int			vendor_id = ATH3KFW_VENDOR_ID;
+static int			product_id = ATH3KFW_PRODUCT_ID;
+
 /*
  * Firmware downloader for Atheros AR3011 based USB Bluetooth devices
  */
@@ -78,7 +81,7 @@
 	addr = 0;
 	firmware = ATH3KFW_FW;
 
-	while ((n = getopt(argc, argv, "d:f:h")) != -1) {
+	while ((n = getopt(argc, argv, "d:f:hp:v:")) != -1) {
 		switch (n) {
 		case 'd': /* ugen device name */
 			if (parse_ugen_name(optarg, &bus, &addr) < 0)
@@ -88,7 +91,12 @@
 		case 'f': /* firmware file */
 			firmware = optarg;
 			break;
-
+		case 'p': /* product id */
+			product_id = strtol(optarg, NULL, 0);
+			break;
+		case 'v': /* vendor id */
+			vendor_id = strtol(optarg, NULL, 0);
+			break;
 		case 'h':
 		default:
 			usage();
@@ -166,8 +174,8 @@
 		if (desc == NULL)
 			continue;
 
-		if (desc->idVendor != ATH3KFW_VENDOR_ID ||
-		    desc->idProduct != ATH3KFW_PRODUCT_ID)
+		if (desc->idVendor != vendor_id ||
+		    desc->idProduct != product_id)
 			continue;
 
 		break;
@@ -280,6 +288,8 @@
 "Where:\n" \
 "\t-d ugenX.Y           ugen device name\n" \
 "\t-f firmware image    firmware image file name for download\n" \
+"\t-v vendor_id         vendor id\n" \
+"\t-p vendor_id         product id\n" \
 "\t-h                   display this message\n", ATH3KFW, ATH3KFW);
 
         exit(255);
Index: sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
===================================================================
--- sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	(revision 248804)
+++ sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	(working copy)
@@ -386,6 +386,39 @@
 {
 	/* AVM USB Bluetooth-Adapter BlueFritz! v1.0 */
 	{ USB_VPI(USB_VENDOR_AVM, 0x2200, 0) },
+
+	/* Atheros 3011 with sflash firmware */
+	{ USB_VPI(0x0cf3, 0x3002, 0) },
+	{ USB_VPI(0x0cf3, 0xe019, 0) },
+	{ USB_VPI(0x13d3, 0x3304, 0) },
+	{ USB_VPI(0x0930, 0x0215, 0) },
+	{ USB_VPI(0x0489, 0xe03d, 0) },
+	{ USB_VPI(0x0489, 0xe027, 0) },
+
+	/* Atheros AR9285 Malbec with sflash firmware */
+	{ USB_VPI(0x03f0, 0x311d, 0) },
+
+	/* Atheros 3012 with sflash firmware */
+	{ USB_VPI(0x0cf3, 0x3004, 0) },
+	{ USB_VPI(0x0cf3, 0x311d, 0) },
+	{ USB_VPI(0x13d3, 0x3375, 0) },
+	{ USB_VPI(0x04ca, 0x3005, 0) },
+	{ USB_VPI(0x04ca, 0x3006, 0) },
+	{ USB_VPI(0x04ca, 0x3008, 0) },
+	{ USB_VPI(0x13d3, 0x3362, 0) },
+	{ USB_VPI(0x0cf3, 0xe004, 0) },
+	{ USB_VPI(0x0930, 0x0219, 0) },
+	{ USB_VPI(0x0489, 0xe057, 0) },
+	{ USB_VPI(0x13d3, 0x3393, 0) },
+	{ USB_VPI(0x0489, 0xe04e, 0) },
+	{ USB_VPI(0x0489, 0xe056, 0) },
+
+	/* Atheros AR5BBU12 with sflash firmware */
+	{ USB_VPI(0x0489, 0xe02c, 0) },
+
+	/* Atheros AR5BBU12 with sflash firmware */
+	{ USB_VPI(0x0489, 0xe03c, 0) },
+	{ USB_VPI(0x0489, 0xe036, 0) },
 };
 
 /* List of supported bluetooth devices */