diff --git a/hdf5.changes b/hdf5.changes
index 5aa00ac..c4d63f3 100644
--- a/hdf5.changes
+++ b/hdf5.changes
@@ -2,7 +2,7 @@
 Tue Oct 17 14:07:15 UTC 2017 - eich@suse.com
 
 - Add magic to limit the number of flavors built in the OBS ring
-  to non-HPC builds.
+  to non-HPC and mvapich2 builds.
 - Fix %libname() for non-HPC builds.
 
 -------------------------------------------------------------------
diff --git a/hdf5.spec b/hdf5.spec
index 93cf20e..2eec40d 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -100,12 +100,15 @@ ExclusiveArch:  do_not_build
 
 %{?with_mpi:%global my_suffix -%{mpi_flavor}}
 
-%if %{with hpc}
 # Magic for OBS Staging. Only build the flavors required by
 # other packages in the ring.
 %if %{with ringdisabled}
+ %if %{with hpc} || "%{?mpi_flavor}" == "mvapich2"
 ExclusiveArch:  do_not_build
+ %endif
 %endif
+
+%if %{with hpc}
 %{hpc_init -c %compiler_family %{?with_mpi:-m %mpi_flavor} %{?c_f_ver:-v %{c_f_ver}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}}
 %{?with_mpi:%global hpc_module_pname p%{pname}}
  %define my_prefix %hpc_prefix