diff --git a/Mesa.changes b/Mesa.changes
index 71cbead..7af2b4c 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Jun 26 08:27:46 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- u_egl-gbm-Enable-RGBA-configs.patch,
+  u_egl-surfaceless-Enable-RGBA-configs.patch
+  * these are needed now after applying previous patch 
+    u_dri-Fix-BGR-format-exclusion.patch also on other platforms
+    than s390x? (boo#1226725)
+
 -------------------------------------------------------------------
 Tue Jun 25 11:14:15 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa.spec b/Mesa.spec
index ea115eb..f5f306e 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -184,6 +184,8 @@ Patch58:        u_dep_xcb.patch
 Patch100:       U_fix-mpeg1_2-decode-mesa-20.2.patch
 Patch400:       n_stop-iris-flicker.patch
 Patch500:       u_dri-Fix-BGR-format-exclusion.patch
+Patch501:       u_egl-gbm-Enable-RGBA-configs.patch
+Patch502:       u_egl-surfaceless-Enable-RGBA-configs.patch
 %ifarch %{ix86} x86_64
 BuildRequires:  DirectX-Headers
 %endif
@@ -839,6 +841,8 @@ cp %{SOURCE6} subprojects/packagecache/
 %patch -P 100 -p1
 %patch -P 400 -p1
 %patch -P 500 -p1
+%patch -P 501 -p1
+%patch -P 502 -p1
 
 # Remove requires to vulkan libs from baselibs.conf on platforms
 # where vulkan build is disabled; ugly ...
diff --git a/u_egl-gbm-Enable-RGBA-configs.patch b/u_egl-gbm-Enable-RGBA-configs.patch
new file mode 100644
index 0000000..bdfaa4b
--- /dev/null
+++ b/u_egl-gbm-Enable-RGBA-configs.patch
@@ -0,0 +1,29 @@
+From b3904d23ccc76b76d352a160164f293cf65305e0 Mon Sep 17 00:00:00 2001
+From: Daniel Stone <daniels@collabora.com>
+Date: Fri, 21 Jun 2024 14:19:06 +0100
+Subject: [PATCH] egl/gbm: Enable RGBA configs
+
+Doing this is harmless since we operate on an allowlist of pipe_configs
+anyway.
+
+Signed-off-by: Daniel Stone <daniels@collabora.com>
+---
+ src/gbm/backends/dri/gbm_dri.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c
+index 0526f4f8dc1..6cc2d5d8197 100644
+--- a/src/gbm/backends/dri/gbm_dri.c
++++ b/src/gbm/backends/dri/gbm_dri.c
+@@ -108,6 +108,8 @@ dri_get_capability(void *loaderPrivate, enum dri_loader_cap cap)
+    switch (cap) {
+    case DRI_LOADER_CAP_FP16:
+       return 1;
++   case DRI_LOADER_CAP_RGBA_ORDERING:
++      return 1;
+    default:
+       return 0;
+    }
+-- 
+2.35.3
+
diff --git a/u_egl-surfaceless-Enable-RGBA-configs.patch b/u_egl-surfaceless-Enable-RGBA-configs.patch
new file mode 100644
index 0000000..5c63f52
--- /dev/null
+++ b/u_egl-surfaceless-Enable-RGBA-configs.patch
@@ -0,0 +1,29 @@
+From 1eb67fcae01d9f4fbe584e718d71cdfa745ce75f Mon Sep 17 00:00:00 2001
+From: Daniel Stone <daniels@collabora.com>
+Date: Fri, 21 Jun 2024 14:19:06 +0100
+Subject: [PATCH] egl/surfaceless: Enable RGBA configs
+
+Doing this is harmless since we operate on an allowlist of pipe_configs
+anyway.
+
+Signed-off-by: Daniel Stone <daniels@collabora.com>
+---
+ src/egl/drivers/dri2/platform_surfaceless.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c
+index 0668ec9285f..4b69874d3f6 100644
+--- a/src/egl/drivers/dri2/platform_surfaceless.c
++++ b/src/egl/drivers/dri2/platform_surfaceless.c
+@@ -190,6 +190,8 @@ surfaceless_get_capability(void *loaderPrivate, enum dri_loader_cap cap)
+    switch (cap) {
+    case DRI_LOADER_CAP_FP16:
+       return 1;
++   case DRI_LOADER_CAP_RGBA_ORDERING:
++      return 1;
+    default:
+       return 0;
+    }
+-- 
+2.35.3
+