diff --git a/strace.spec b/strace.spec
index 4049078..d73f7b3 100644
--- a/strace.spec
+++ b/strace.spec
@@ -96,6 +96,16 @@ kver="$(printf '%%s\n%%s\n' '#include <linux/version.h>' 'LINUX_VERSION_CODE' |
 printf 'kernel-headers %%s.%%s.%%s\n' $(($kver/65536)) $(($kver/256%%256)) $(($kver%%256))
 echo 'END OF BUILD ENVIRONMENT INFORMATION'
 
+CFLAGS="$RPM_OPT_FLAGS $LDFLAGS"
+# Removing explicit -m64 as it breaks mpers
+[ "x${CFLAGS#*-m64}" = "x${CFLAGS}" ] || CFLAGS=$(echo "$CFLAGS" | sed 's/-m64//g')
+export CFLAGS
+
+CPPFLAGS="-isystem %{_includedir} %{optflags}"
+# Removing explicit -m64 as it breaks mpers
+[ "x${CPPFLAGS#*-m64}" = "x${CPPFLAGS}" ] || CPPFLAGS=$(echo "$CPPFLAGS" | sed 's/-m64//g')
+export CPPFLAGS
+
 CFLAGS_FOR_BUILD="$RPM_OPT_FLAGS"; export CFLAGS_FOR_BUILD
 %configure --enable-mpers=check
 %make_build
@@ -132,6 +142,8 @@ echo 'END OF TEST SUITE INFORMATION'
   with upstream v5.13-10-g0211fdc "tests: change sockopt-timestamp test
   to use syscall(__NR_recvmsg)"
   and 0154-tests-call-setsockopt-directly-in-sockopt-timestamp.patch.
+- Undo forceful injection of -m64 into CFLAGS/CPPFLAGS to avoid breaking
+  mpers and its tests (#1996676).
 
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 5.13-2
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags