diff --git a/boost.spec b/boost.spec
index 9b1a164..a6e5f4e 100644
--- a/boost.spec
+++ b/boost.spec
@@ -16,9 +16,13 @@
 # All arches have mpich
 %bcond_without mpich
 
-%if 0%{?fedora} >= 40 && "%{_arch}" == "i686"
-  # No OpenMPI support on these arches
-  %bcond_with openmpi
+%if 0%{?fedora} >= 40
+%ifarch %{ix86}
+    # No OpenMPI support on these arches
+    %bcond_with openmpi
+%else
+    %bcond_without openmpi
+%endif
 %else
   %bcond_without openmpi
 %endif