diff -druNp linux-libre-2.6.39.4-gnu/drivers/bluetooth/ath3k.c linux-libre-2.6.39.4-gnu1/drivers/bluetooth/ath3k.c
--- linux-libre-2.6.39.4-gnu/drivers/bluetooth/ath3k.c	2012-03-25 08:19:11.000000000 -0400
+++ linux-libre-2.6.39.4-gnu1/drivers/bluetooth/ath3k.c	2013-05-03 02:04:03.000000000 -0400
@@ -278,7 +278,7 @@ static int ath3k_load_patch(struct usb_d
 		return ret;
 	}
 
-	snprintf(filename, ATH3K_NAME_LEN, "ar3k/AthrBT_0x%08x.dfu",
+	snprintf(filename, ATH3K_NAME_LEN, "/*(DEBLOBBED)*/",
 		fw_version.rom_version);
 
 	ret = reject_firmware(&firmware, filename, &udev->dev);
@@ -340,7 +340,7 @@ static int ath3k_load_syscfg(struct usb_
 		break;
 	}
 
-	snprintf(filename, ATH3K_NAME_LEN, "ar3k/ramps_0x%08x_%d%s",
+	snprintf(filename, ATH3K_NAME_LEN, "/*(DEBLOBBED)*/",
 		fw_version.rom_version, clk_value, ".dfu");
 
 	ret = reject_firmware(&firmware, filename, &udev->dev);
diff -druNp linux-libre-2.6.39.4-gnu/drivers/net/wireless/ath/ath9k/hif_usb.c linux-libre-2.6.39.4-gnu1/drivers/net/wireless/ath/ath9k/hif_usb.c
--- linux-libre-2.6.39.4-gnu/drivers/net/wireless/ath/ath9k/hif_usb.c	2012-03-25 08:18:03.000000000 -0400
+++ linux-libre-2.6.39.4-gnu1/drivers/net/wireless/ath/ath9k/hif_usb.c	2011-08-03 15:43:28.000000000 -0400
@@ -17,11 +17,13 @@
 #include "htc.h"
 
 /* identify firmware images */
-#define FIRMWARE_AR7010		"/*(DEBLOBBED)*/"
-#define FIRMWARE_AR7010_1_1	"/*(DEBLOBBED)*/"
-#define FIRMWARE_AR9271		"/*(DEBLOBBED)*/"
+#define FIRMWARE_AR7010		"ar7010.fw"
+#define FIRMWARE_AR7010_1_1	"ar7010_1_1.fw"
+#define FIRMWARE_AR9271		"ar9271.fw"
 
-/*(DEBLOBBED)*/
+MODULE_FIRMWARE(FIRMWARE_AR7010);
+MODULE_FIRMWARE(FIRMWARE_AR7010_1_1);
+MODULE_FIRMWARE(FIRMWARE_AR9271);
 
 static struct usb_device_id ath9k_hif_usb_ids[] = {
 	{ USB_DEVICE(0x0cf3, 0x9271) }, /* Atheros */
@@ -879,7 +881,7 @@ static int ath9k_hif_usb_dev_init(struct
 	struct usb_endpoint_descriptor *endp;
 
 	/* Request firmware */
-	ret = reject_firmware(&hif_dev->firmware, hif_dev->fw_name,
+	ret = request_firmware(&hif_dev->firmware, hif_dev->fw_name,
 			       &hif_dev->udev->dev);
 	if (ret) {
 		dev_err(&hif_dev->udev->dev,
diff -druNp linux-libre-2.6.39.4-gnu/drivers/staging/ath6kl/Kconfig linux-libre-2.6.39.4-gnu1/drivers/staging/ath6kl/Kconfig
--- linux-libre-2.6.39.4-gnu/drivers/staging/ath6kl/Kconfig	2011-08-03 15:43:28.000000000 -0400
+++ linux-libre-2.6.39.4-gnu1/drivers/staging/ath6kl/Kconfig	2013-05-03 02:02:16.000000000 -0400
@@ -16,22 +16,22 @@ choice
 config AR600x_SD31_XXX
 	bool "SD31-xxx"
 	help
-        Board Data file for a standard SD31 reference design (File: bdata.SD31.bin)
+        Board Data file for a standard SD31 reference design (File: /*DEBLOBBED*/)
 
 config AR600x_WB31_XXX
 	bool "WB31-xxx"
 	help
-        Board Data file for a standard WB31 (BT/WiFi) reference design (File: bdata.WB31.bin)
+        Board Data file for a standard WB31 (BT/WiFi) reference design (File: /*DEBLOBBED*/)
 
 config AR600x_SD32_XXX
 	bool "SD32-xxx"
 	help
-        Board Data file for a standard SD32 (5GHz) reference design (File: bdata.SD32.bin)
+        Board Data file for a standard SD32 (5GHz) reference design (File: /*DEBLOBBED*/)
 
 config AR600x_CUSTOM_XXX
 	bool "CUSTOM-xxx"
 	help
-        Board Data file for a custom reference design (File: should be named as bdata.CUSTOM.bin)
+        Board Data file for a custom reference design (File: should be named as /*DEBLOBBED*/)
 endchoice
 
 config ATH6KL_ENABLE_COEXISTENCE
diff -druNp linux-libre-2.6.39.4-gnu/Makefile linux-libre-2.6.39.4-gnu1/Makefile
--- linux-libre-2.6.39.4-gnu/Makefile	2012-03-25 08:10:40.000000000 -0400
+++ linux-libre-2.6.39.4-gnu1/Makefile	2013-05-03 01:53:06.000000000 -0400
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 39
-EXTRAVERSION = .4-gnu
+EXTRAVERSION = .4-gnu1
 NAME = Flesh-Eating Bats with Fangs
 
 # *DOCUMENTATION*
