diff --git a/debian/patches/apertis/rpi/0059-Tweak-Rasperry-Pi-enviroment-to-avoid-broken-macro-e.patch b/debian/patches/apertis/rpi/0059-Tweak-Rasperry-Pi-enviroment-to-avoid-broken-macro-e.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9409abae8bea51719f3c4fb1c3dcd5eac90cf542
--- /dev/null
+++ b/debian/patches/apertis/rpi/0059-Tweak-Rasperry-Pi-enviroment-to-avoid-broken-macro-e.patch
@@ -0,0 +1,33 @@
+From: Martyn Welch <martyn.welch@collabora.com>
+Date: Fri, 26 Jan 2024 10:43:16 +0000
+Subject: Tweak Rasperry Pi enviroment to avoid broken macro expansion
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+The Raspberry Pi environment appears to now be being automatically
+escaped, however we are already manually escaping in places that results
+in unexpected double escaping and breakage during macro expansion:
+
+[ 1979s] include/generated/environment.h:1:296: error: expected ‘}’ before ‘extlinux’
+[ 1979s]     1 | #define CONFIG_EXTRA_ENV_TEXT ...   ...boot_syslinux_conf \\"extlinux/extlinux...
+[ 1979s]       |                                                              ^~~~~~~~
+
+Signed-off-by: Martyn Welch <martyn.welch@collabora.com>
+---
+ board/raspberrypi/rpi/rpi.env | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/board/raspberrypi/rpi/rpi.env b/board/raspberrypi/rpi/rpi.env
+index 887b2d9..96a3083 100644
+--- a/board/raspberrypi/rpi/rpi.env
++++ b/board/raspberrypi/rpi/rpi.env
+@@ -9,7 +9,7 @@ stdin=serial,usbkbd
+ stdout=serial,vidconsole
+ stderr=serial,vidconsole
+ bootlimit=3
+-altbootcmd=setenv boot_syslinux_conf \"extlinux/extlinux-rollback.conf\"; run distro_bootcmd
++altbootcmd=setenv boot_syslinux_conf "extlinux/extlinux-rollback.conf"; run distro_bootcmd
+ 
+ /* DFU over USB/UDC */
+ #ifdef CONFIG_CMD_DFU
diff --git a/debian/patches/series b/debian/patches/series
index 4e348b80fa698e504b62acf2c0cbac53d25278dd..5581303d9bac1c8c3ecc273735f83ead05a07546 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -64,6 +64,7 @@ apertis/rpi/0012-arm-rpi-Add-generic-device-tree-for-RPi-CM4-boards.patch
 apertis/rpi/0013-ARM-dts-bcm2711-rpi-4-b-Use-aliases-to-set-custom-MM.patch
 apertis/rpi/0014-ARM-dts-bcm2711-rpi-cm4-Use-aliases-to-set-custom-MM.patch
 apertis/rpi/0015-ARM-dts-Add-bcm2711-vl805-device-tree-overlay.patch
+apertis/rpi/0059-Tweak-Rasperry-Pi-enviroment-to-avoid-broken-macro-e.patch
 
 # Support for Rockchip boards
 apertis/rk3399/0001-rockchip-rock-pi-4-Add-bootcount-config.patch