diff --git a/bluez-5.59-0388794dc5fdb73a4ea.diff b/bluez-5.59-0388794dc5fdb73a4ea.diff
new file mode 100644
index 0000000..eb0974c
--- /dev/null
+++ b/bluez-5.59-0388794dc5fdb73a4ea.diff
@@ -0,0 +1,38 @@
+From 0388794dc5fdb73a4ea88bcf148de0a12b4364d4 Mon Sep 17 00:00:00 2001
+From: Archie Pusaka <apusaka@chromium.org>
+Date: Thu, 17 Jun 2021 08:53:34 +0800
+Subject: avdtp: Fix parsing capabilities
+
+This patch fixes size comparison and variable misassignment.
+
+Reviewed-by: Alain Michaud <alainm@chromium.org>
+Reviewed-by: Michael Sun <michaelfsun@google.com>
+---
+ profiles/audio/avdtp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
+index c7bf99f42..5d13104c1 100644
+--- a/profiles/audio/avdtp.c
++++ b/profiles/audio/avdtp.c
+@@ -1323,7 +1323,7 @@ static GSList *caps_to_list(uint8_t *data, size_t size,
+ 
+ 		cap = (struct avdtp_service_capability *)data;
+ 
+-		if (sizeof(*cap) + cap->length >= size) {
++		if (sizeof(*cap) + cap->length > size) {
+ 			error("Invalid capability data in getcap resp");
+ 			break;
+ 		}
+@@ -1345,7 +1345,7 @@ static GSList *caps_to_list(uint8_t *data, size_t size,
+ 		switch (cap->category) {
+ 		case AVDTP_MEDIA_CODEC:
+ 			if (codec)
+-				*codec = cap;
++				*codec = cpy;
+ 			break;
+ 		case AVDTP_DELAY_REPORTING:
+ 			if (delay_reporting)
+-- 
+cgit 1.2.3-1.el7
+
diff --git a/bluez.changes b/bluez.changes
index 844c6e3..4196130 100644
--- a/bluez.changes
+++ b/bluez.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Jul  4 19:14:36 UTC 2021 - Stefan Seyfried <seife+obs@b1-systems.com>
+
+- add bluez-5.59-0388794dc5fdb73a4ea.diff, fixes a2dp on newly
+  paired devices, https://github.com/bluez/bluez/issues/157
+
 -------------------------------------------------------------------
 Thu Jun 17 13:45:19 UTC 2021 - Stefan Seyfried <seife+obs@b1-systems.com>
 
diff --git a/bluez.spec b/bluez.spec
index 00a27d6..576fcb6 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -45,6 +45,8 @@ Patch3:         bluez-cups-libexec.patch
 Patch4:         bluez-disable-broken-tests.diff
 # get rid of python2. WARNING: this is autogenerated by 2to3 and might not work
 Patch5:         bluez-test-2to3.diff
+# PATCH-FIX-UPSTREAM: upstream commit until bluez-5.60 is out, https://github.com/bluez/bluez/issues/157
+Patch6:         bluez-5.59-0388794dc5fdb73a4ea.diff
 # Move 43xx firmware path for RPi3 bluetooth support bsc#1140688
 Patch10:        RPi-Move-the-43xx-firmware-into-lib-firmware.patch
 # Upstream suggests to use btmon instead of hcidump and does not want those patches