diff --git a/Mesa.changes b/Mesa.changes
index b5797b3..cd9e950 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 17 07:20:51 UTC 2017 - msrb@suse.com
+
+- u_r600-Add-support-for-B5G5R5A1.patch
+  * Fixes rendercheck tests when X server accelerates using glamor.
+    (bnc#1047154)
+
 -------------------------------------------------------------------
 Sun Jul 16 09:25:32 UTC 2017 - mimi.vx@gmail.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 698d6f8..fa67914 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -86,6 +86,7 @@ Patch31:        archlinux_0001-Fix-linkage-against-shared-glapi.patch
 Patch32:        archlinux_glvnd-fix-gl-dot-pc.patch
 Patch40:        u_gallivm-correct-channel-shift-logic-on-big-endian.patch
 Patch41:        u_llvmpipe-lp_build_gather_elem_vec-BE-fix-for-3x16-lo.patch
+Patch42:        u_r600-Add-support-for-B5G5R5A1.patch
 
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
@@ -659,6 +660,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 
 %patch40 -p1
 %patch41 -p1
+%patch42 -p1
 
 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
 # disabling libglvnd build; ugly ...
diff --git a/u_r600-Add-support-for-B5G5R5A1.patch b/u_r600-Add-support-for-B5G5R5A1.patch
new file mode 100644
index 0000000..8eec796
--- /dev/null
+++ b/u_r600-Add-support-for-B5G5R5A1.patch
@@ -0,0 +1,27 @@
+Author: Michal Srb <michalsrb@gmail.com>
+Subject: r600: Add support for B5G5R5A1.
+Patch-Mainline: To be upstreamed
+References: bnc#1047154
+
+Fixes rendercheck errors when using glamor acceleration in X server.
+---
+ src/gallium/drivers/r600/r600_asm.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
+index 9e00528c5c..be2a086594 100644
+--- a/src/gallium/drivers/r600/r600_asm.c
++++ b/src/gallium/drivers/r600/r600_asm.c
+@@ -2350,6 +2350,12 @@ void r600_vertex_data_type(enum pipe_for
+ 		return;
+ 	}
+ 
++	if (pformat == PIPE_FORMAT_B5G5R5A1_UNORM) {
++		*format = FMT_1_5_5_5;
++		*endian = r600_endian_swap(16);
++		return;
++	}
++
+ 	desc = util_format_description(pformat);
+ 	if (desc->layout != UTIL_FORMAT_LAYOUT_PLAIN) {
+ 		goto out_unknown;