diff --git a/port/esp32/components/btstack/component.mk b/port/esp32/components/btstack/component.mk
index 531999a92..af7fa4c5d 100644
--- a/port/esp32/components/btstack/component.mk
+++ b/port/esp32/components/btstack/component.mk
@@ -16,6 +16,7 @@ COMPONENT_ADD_INCLUDEDIRS := \
 	3rd-party/hxcmod-player \
 	3rd-party/hxcmod-player/mods \
 	3rd-party/md5 \
+	3rd-party/yxml \
 	src/classic \
 	src/ble/gatt-service \
 	src/ble \
diff --git a/port/esp32/integrate_btstack.py b/port/esp32/integrate_btstack.py
index 2f1d1e9e0..9b0759f70 100755
--- a/port/esp32/integrate_btstack.py
+++ b/port/esp32/integrate_btstack.py
@@ -40,6 +40,7 @@ dirs_to_copy = [
 '3rd-party/bluedroid',
 '3rd-party/hxcmod-player',
 '3rd-party/md5',
+'3rd-party/yxml',
 'platform/freertos',
 'platform/embedded',
 'tool'
diff --git a/port/max32630-fthr/example/template/Makefile b/port/max32630-fthr/example/template/Makefile
index 2d4568ea1..4a283e0ec 100644
--- a/port/max32630-fthr/example/template/Makefile
+++ b/port/max32630-fthr/example/template/Makefile
@@ -105,6 +105,7 @@ VPATH += ${BTSTACK_ROOT}/3rd-party/bluedroid/encoder/srce
 VPATH += ${BTSTACK_ROOT}/3rd-party/hxcmod-player
 VPATH += ${BTSTACK_ROOT}/3rd-party/hxcmod-player/mods
 VPATH += ${BTSTACK_ROOT}/3rd-party/md5
+VPATH += ${BTSTACK_ROOT}/3rd-party/yxml
 VPATH += ${BTSTACK_ROOT}/3rd-party/micro-ecc
 VPATH += ${BTSTACK_ROOT}/platform/embedded
 VPATH += ${BTSTACK_ROOT}/src/ble/gatt-service/
@@ -121,6 +122,7 @@ PROJ_CFLAGS += \
     -I${BTSTACK_ROOT}/3rd-party/bluedroid/decoder/include \
 	-I${BTSTACK_ROOT}/3rd-party/bluedroid/encoder/include \
     -I${BTSTACK_ROOT}/3rd-party/md5 \
+    -I${BTSTACK_ROOT}/3rd-party/yxml \
 	-I${BTSTACK_ROOT}/3rd-party/micro-ecc \
 	-I${BTSTACK_ROOT}/3rd-party/hxcmod-player \
 
@@ -228,7 +230,7 @@ SRCS += $(CVSD_PLC_OBJ)
 SRCS += $(HXCMOD_PLAYER_OBJ)
 SRCS += $(HFP_OBJ)
 SRCS += hsp_hs.o hsp_ag.o 
-SRCS += obex_iterator.o goep_client.o pbap_client.o md5.o
+SRCS += obex_iterator.o goep_client.o pbap_client.o md5.o yxml.o
 
 # Enable assertion checking for development
 PROJ_CFLAGS+=-DMXC_ASSERT_ENABLE
diff --git a/port/stm32-f4discovery-cc256x/cubemx-f4discovery-cc256x/Makefile b/port/stm32-f4discovery-cc256x/cubemx-f4discovery-cc256x/Makefile
index 1da7ed423..73b2b6a73 100644
--- a/port/stm32-f4discovery-cc256x/cubemx-f4discovery-cc256x/Makefile
+++ b/port/stm32-f4discovery-cc256x/cubemx-f4discovery-cc256x/Makefile
@@ -39,6 +39,7 @@ VPATH += ${BTSTACK_ROOT}/3rd-party/bluedroid/encoder/srce
 VPATH += ${BTSTACK_ROOT}/3rd-party/hxcmod-player
 VPATH += ${BTSTACK_ROOT}/3rd-party/hxcmod-player/mods
 VPATH += ${BTSTACK_ROOT}/3rd-party/md5
+VPATH += ${BTSTACK_ROOT}/3rd-party/yxml
 VPATH += ${BTSTACK_ROOT}/3rd-party/segger-rtt
 VPATH += ${BTSTACK_ROOT}/chipset/cc256x
 VPATH += ${BTSTACK_ROOT}/example
@@ -160,6 +161,7 @@ hsp_hs.c \
 hsp_ag.c \
 hid_device.c \
 md5.c \
+yxml.c \
 rfcomm.c \
 sco_demo_util.c \
 btstack_hid_parser.c \
@@ -242,6 +244,7 @@ C_INCLUDES += -I${BTSTACK_ROOT}/3rd-party/bluedroid/encoder/include
 C_INCLUDES += -I${BTSTACK_ROOT}/3rd-party/hxcmod-player
 C_INCLUDES += -I${BTSTACK_ROOT}/3rd-party/hxcmod-player/mods
 C_INCLUDES += -I${BTSTACK_ROOT}/3rd-party/md5
+C_INCLUDES += -I${BTSTACK_ROOT}/3rd-party/yxml
 C_INCLUDES += -I${BTSTACK_ROOT}/3rd-party/segger-rtt
 C_INCLUDES += -I${BTSTACK_ROOT}/platform/embedded
 C_INCLUDES += -I${BTSTACK_ROOT}/chipset/cc256x