diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk
index 572047997b..4700a9297d 100644
--- a/packages/network/bluez/package.mk
+++ b/packages/network/bluez/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bluez"
-PKG_VERSION="5.83"
-PKG_SHA256="108522d909d220581399bfec93daab62035539ceef3dda3e79970785c63bd24c"
+PKG_VERSION="5.84"
+PKG_SHA256="5ba73d030f7b00087d67800b0e321601aec0f892827c72e5a2c8390d8c886b11"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.bluez.org/"
 PKG_URL="https://www.kernel.org/pub/linux/bluetooth/${PKG_NAME}-${PKG_VERSION}.tar.xz"
diff --git a/packages/network/bluez/patches/bluez-21-hciattach-add-QCA9377-Tuffello-support.patch b/packages/network/bluez/patches/bluez-21-hciattach-add-QCA9377-Tuffello-support.patch
index 86839fa62c..e86b620116 100644
--- a/packages/network/bluez/patches/bluez-21-hciattach-add-QCA9377-Tuffello-support.patch
+++ b/packages/network/bluez/patches/bluez-21-hciattach-add-QCA9377-Tuffello-support.patch
@@ -20,12 +20,11 @@ hciattach_rome: display ROM and TLV info by default
 Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
 ---
  Makefile.tools         |    1 +
- android/Android.mk     |    1 +
  tools/hciattach.c      |   12 +
  tools/hciattach.h      |    1 +
  tools/hciattach_rome.c | 1872 ++++++++++++++++++++++++++++++++++++++++
  tools/hciattach_rome.h |  388 +++++++++
- 6 files changed, 2275 insertions(+)
+ 5 files changed, 2274 insertions(+)
  create mode 100644 tools/hciattach_rome.c
  create mode 100644 tools/hciattach_rome.h
 
@@ -41,18 +40,6 @@ index b7b422506..e0e995089 100644
  						tools/hciattach_qualcomm.c \
  						tools/hciattach_intel.c \
  						tools/hciattach_bcm43xx.c
-diff --git a/android/Android.mk b/android/Android.mk
-index 76a826b47..01599c04b 100644
---- a/android/Android.mk
-+++ b/android/Android.mk
-@@ -697,6 +697,7 @@ LOCAL_SRC_FILES := \
- 	bluez/tools/hciattach_ti.c \
- 	bluez/tools/hciattach_tialt.c \
- 	bluez/tools/hciattach_ath3k.c \
-+	bluez/tools/hciattach_rome.c \
- 	bluez/tools/hciattach_qualcomm.c \
- 	bluez/tools/hciattach_intel.c \
- 	bluez/tools/hciattach_bcm43xx.c \
 diff --git a/tools/hciattach.c b/tools/hciattach.c
 index fad176c9b..02a65c692 100644
 --- a/tools/hciattach.c