diff -Nru libseccomp-2.5.0/debian/changelog libseccomp-2.5.0/debian/changelog
--- libseccomp-2.5.0/debian/changelog	2020-11-08 18:59:21.000000000 +0000
+++ libseccomp-2.5.0/debian/changelog	2020-11-17 18:53:52.000000000 +0000
@@ -1,3 +1,11 @@
+libseccomp (2.5.0-3+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 2.4.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 24 Jul 2019 22:12:36 +0000]
+  * Move valigrind from build-depends to build-conflicts, raspbians valgrind
+    is somewhat broken and causes testsuite failures.
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 17 Nov 2020 18:53:52 +0000
+
 libseccomp (2.5.0-3) unstable; urgency=medium
 
   * Cherry-pick patch from the 2.5 branch to fix test error on mips:
diff -Nru libseccomp-2.5.0/debian/control libseccomp-2.5.0/debian/control
--- libseccomp-2.5.0/debian/control	2020-11-01 11:01:35.000000000 +0000
+++ libseccomp-2.5.0/debian/control	2020-11-17 18:53:52.000000000 +0000
@@ -9,8 +9,9 @@
                python3-all-dev:any <!nopython>,
                libpython3-all-dev <!nopython>,
                cython3:native <!nopython>,
-               valgrind [amd64 arm64 armhf i386 mips mips64 powerpc ppc64 ppc64el s390x] <!nocheck>,
                gperf
+Build-Conflicts:
+               valgrind
 Rules-Requires-Root: no
 Standards-Version: 3.9.7
 Homepage: https://github.com/seccomp/libseccomp