diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index 91769a2..048be52 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jul  1 12:46:33 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- force valgrind support only on officially supported platforms
+  (boo#1173355)
+
 -------------------------------------------------------------------
 Fri Jun 26 11:43:50 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index 23923e7..e89e01d 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -158,7 +158,9 @@ BuildRequires:  pkgconfig(libdrm_radeon) >= 2.4.71
 %if 0%{?libglvnd}
 BuildRequires:  pkgconfig(libglvnd) >= 0.1.0
 %endif
-BuildRequires:  valgrind-devel
+%ifarch aarch64 %{ix86} x86_64 ppc64le s390x
+BuildRequires:  pkgconfig(valgrind)
+%endif
 BuildRequires:  pkgconfig(libkms) >= 1.0.0
 BuildRequires:  pkgconfig(libva)
 BuildRequires:  pkgconfig(presentproto)
@@ -834,7 +836,9 @@ egl_platforms=x11,drm,surfaceless,wayland
             -Ddri-drivers=swrast \
             -Dgallium-drivers= \
 %endif
+%ifarch aarch64 %{ix86} x86_64 ppc64le s390x
             -Dvalgrind=true \
+%endif
             -Db_ndebug=true \
             -Dc_args="%{optflags}" \
             -Dcpp_args="%{optflags}"
diff --git a/Mesa.changes b/Mesa.changes
index 91769a2..048be52 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jul  1 12:46:33 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- force valgrind support only on officially supported platforms
+  (boo#1173355)
+
 -------------------------------------------------------------------
 Fri Jun 26 11:43:50 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa.spec b/Mesa.spec
index 16ed40e..4f73625 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -157,7 +157,9 @@ BuildRequires:  pkgconfig(libdrm_radeon) >= 2.4.71
 %if 0%{?libglvnd}
 BuildRequires:  pkgconfig(libglvnd) >= 0.1.0
 %endif
-BuildRequires:  valgrind-devel
+%ifarch aarch64 %{ix86} x86_64 ppc64le s390x
+BuildRequires:  pkgconfig(valgrind)
+%endif
 BuildRequires:  pkgconfig(libkms) >= 1.0.0
 BuildRequires:  pkgconfig(libva)
 BuildRequires:  pkgconfig(presentproto)
@@ -833,7 +835,9 @@ egl_platforms=x11,drm,surfaceless,wayland
             -Ddri-drivers=swrast \
             -Dgallium-drivers= \
 %endif
+%ifarch aarch64 %{ix86} x86_64 ppc64le s390x
             -Dvalgrind=true \
+%endif
             -Db_ndebug=true \
             -Dc_args="%{optflags}" \
             -Dcpp_args="%{optflags}"