diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf
index 1127632bb..776a454c8 100644
--- a/meta-digi-dey/conf/distro/dey.conf
+++ b/meta-digi-dey/conf/distro/dey.conf
@@ -12,7 +12,7 @@ TARGET_VENDOR = "-dey"
 LOCALCONF_VERSION = "1"
 
 # Override these in poky based distros
-POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland"
+POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland bluez5"
 POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-dey-core"
 POKY_DEFAULT_EXTRA_RRECOMMENDS = ""
 
diff --git a/meta-digi-dey/recipes-connectivity/btfilter/btfilter-v3.4p4-b3.4.0.158/bluez-init b/meta-digi-dey/recipes-connectivity/btfilter/btfilter-v3.4p4-b3.4.0.158/bluez-init
index a0ade9f74..65e1af7ae 100755
--- a/meta-digi-dey/recipes-connectivity/btfilter/btfilter-v3.4p4-b3.4.0.158/bluez-init
+++ b/meta-digi-dey/recipes-connectivity/btfilter/btfilter-v3.4p4-b3.4.0.158/bluez-init
@@ -113,7 +113,7 @@ MACHINENAME="$(cat /proc/device-tree/digi,machine,name 2>/dev/null || cat /sys/k
 [ "${MACHINENAME}" = "ccardimx28" -o "${MACHINENAME}" = "ccimx6sbc" ] && bt_init
 
 # Run bluetooth daemon
-if hciconfig hci0 up && bluetoothd; then
+if hciconfig hci0 up && /usr/lib/bluez5/bluetooth/bluetoothd; then
 	:	# No-op
 else
 	echo "${SCRIPTNAME}: FAILED"
diff --git a/meta-digi-dey/recipes-connectivity/btfilter/btfilter_v3.4p4-b3.4.0.158.bb b/meta-digi-dey/recipes-connectivity/btfilter/btfilter_v3.4p4-b3.4.0.158.bb
index f954f8936..6948cebc9 100644
--- a/meta-digi-dey/recipes-connectivity/btfilter/btfilter_v3.4p4-b3.4.0.158.bb
+++ b/meta-digi-dey/recipes-connectivity/btfilter/btfilter_v3.4p4-b3.4.0.158.bb
@@ -5,7 +5,9 @@ SECTION = "network"
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=14;md5=8f6614b37751445a5f6a9bdc69be26b3"
 
-DEPENDS = "bluez4 dbus libnl"
+inherit bluetooth
+
+DEPENDS = "${BLUEZ} dbus libnl"
 
 SRC_URI = " \
     ${DIGI_PKG_SRC}/${PN}-${PV}.tar.bz2 \
diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb
index 5774767eb..459369536 100644
--- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb
+++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb
@@ -6,11 +6,13 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+inherit bluetooth
 inherit packagegroup
 
-RDEPENDS_${PN} = "\
+
+RDEPENDS_${PN} = " \
 	btfilter \
-	bluez4 \
-	bluez4-testtools \
-        ${@base_contains("MACHINE_FEATURES", "bluetooth", "libasound-module-bluez", "", d)} \
+	${BLUEZ} \
+	${BLUEZ}-testtools \
+	${@base_contains("MACHINE_FEATURES", "bluetooth", "libasound-module-bluez", "", d)} \
 "
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt.bb
index 2e789f5cc..975b0c4fa 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt.bb
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-bt.bb
@@ -5,7 +5,9 @@ SECTION = "examples"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-DEPENDS = "bluez4"
+inherit bluetooth
+
+DEPENDS = "${BLUEZ}"
 
 SRC_URI = "file://bt_test"
 
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-btconfig.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-btconfig.bb
index c9a05a1e7..fa6e52f99 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-btconfig.bb
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-btconfig.bb
@@ -5,7 +5,9 @@ SECTION = "examples"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-DEPENDS = "bluez4"
+inherit bluetooth
+
+DEPENDS = "${BLUEZ}"
 
 SRC_URI = "file://btconfig"