diff --git a/libdrm.changes b/libdrm.changes
index 30133ef..027ef12 100644
--- a/libdrm.changes
+++ b/libdrm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb  3 18:32:17 UTC 2016 - eich@suse.com
+
+- Disable valgrind support for all architectures if not
+  explicitely enabled by a macro (boo#963979).
+
 -------------------------------------------------------------------
 Wed Dec 30 02:06:48 UTC 2015 - tobias.johannes.klausmann@mni.thm.de
 
diff --git a/libdrm.spec b/libdrm.spec
index 248d10a..b5fb636 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libdrm
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -48,9 +48,11 @@ BuildRequires:  pkgconfig
 BuildRequires:  util-macros-devel
 BuildRequires:  pkgconfig(pciaccess) >= 0.10
 BuildRequires:  pkgconfig(pthread-stubs)
+%if 0%{?with_valgrind_support:1}
 %ifarch %ix86 x86_64 ppc ppc64 ppc64le s390x %arm
 BuildRequires:  pkgconfig(valgrind)
 %endif
+%endif
 
 %description
 The package contains the userspace interface to the kernel DRM
@@ -188,6 +190,10 @@ autoreconf -fi
 %configure --with-pic \
 %ifnarch %ix86 x86_64 ppc ppc64 ppc64le s390x %arm
 	   --disable-valgrind \
+%else
+%if 0%{!?with_valgrind_support:1}
+	   --disable-valgrind \
+%endif
 %endif
 %ifarch %arm
 	   --enable-omap-experimental-api \