diff --git a/scorep.spec b/scorep.spec
index 98c6fe2..aecfc4e 100644
--- a/scorep.spec
+++ b/scorep.spec
@@ -5,7 +5,7 @@
 # OMPI4 oshcc is now not on all arches (depending on UCX)
 %global oshm 1
 # Fixme: There's something odd here, since aarch64 has the oshm compilers
-%if 0%{?fedora} > 30 || 0%{?el8}
+%if 0%{?fedora} == 32 || 0%{?fedora} == 33 || 0%{?el8}
 %ifnarch ppc64le x86_64
 %global oshm 0
 %endif
@@ -59,8 +59,9 @@ Requires:       otf2-devel%{?_isa} >= 2.3
 Requires:       papi-devel%{?_isa}
 Requires:       ocl-icd-devel%{?_isa}
 Requires:       opari2%{?_isa} >= 2.0
-# Missing papi and libunwind
-ExcludeArch: s390 s390x
+# s390 is missing papi and libunwind; 32-bit fails with configure
+# "cannot determine instruction set" in v7.0.
+ExcludeArch: s390 s390x armv7hl i686
 Provides:       bundled(libunwind) = 1.3
 
 %global with_mpich 1