diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc
index d57740782..c4ce2ee3b 100644
--- a/meta-digi-arm/conf/machine/include/ccardimx28.inc
+++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc
@@ -14,7 +14,8 @@ UBOOT_SUFFIX = "sb"
 WPA_DRIVER = "nl80211"
 
 # Firmware
-MACHINE_FIRMWARE = "firmware-atheros-ar3k"
+MACHINE_FIRMWARE ?= ""
+MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}"
 
 MACHINE_EXTRA_RDEPENDS    += "mtd-utils-ubifs nvram ubootenv update-flash"
 MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros_unknown.bb b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb
similarity index 81%
rename from meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros_unknown.bb
rename to meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb
index 20b732c6e..e5fffebb1 100644
--- a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros_unknown.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb
@@ -4,12 +4,9 @@ SUMMARY = "Firmware files for Digi's platforms, such as Atheros bluetooth."
 SECTION = "base"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://${DIGI_EULA_FILE};md5=ef5b088ca04b6f10b1764aa182f4f51d"
-ALLOW_EMPTY_${PN} = "1"
 
 PR = "${DISTRO}.r0"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/firmware-${PV}:"
-
 SRC_URI = " \
     file://PS_ASIC_class_1.pst \
     file://PS_ASIC_class_2.pst \
@@ -25,8 +22,9 @@ do_install() {
 		${D}${base_libdir}/firmware/ar3k/1020200/
 }
 
-PACKAGES += "${PN}-ar3k"
+# Do not create empty debug and development packages (PN-dbg PN-dev PN-staticdev)
+PACKAGES = "${PN}-ar3k"
 
-FILES_${PN}-ar3k  = "/lib/firmware/ar3k/*"
+FILES_${PN}-ar3k = "/lib/firmware/ar3k"
 
 COMPATIBLE_MACHINE = "(mxs|mx6)"
diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-unknown/PS_ASIC_class_1.pst b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/PS_ASIC_class_1.pst
similarity index 100%
rename from meta-digi-arm/recipes-bsp/firmware-atheros/firmware-unknown/PS_ASIC_class_1.pst
rename to meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/PS_ASIC_class_1.pst
diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-unknown/PS_ASIC_class_2.pst b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/PS_ASIC_class_2.pst
similarity index 100%
rename from meta-digi-arm/recipes-bsp/firmware-atheros/firmware-unknown/PS_ASIC_class_2.pst
rename to meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/PS_ASIC_class_2.pst
diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-unknown/RamPatch.txt b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/RamPatch.txt
similarity index 100%
rename from meta-digi-arm/recipes-bsp/firmware-atheros/firmware-unknown/RamPatch.txt
rename to meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/RamPatch.txt
diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-unknown/readme.txt b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/readme.txt
similarity index 100%
rename from meta-digi-arm/recipes-bsp/firmware-atheros/firmware-unknown/readme.txt
rename to meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/readme.txt