diff --git a/mvapich2.changes b/mvapich2.changes
index 71a70b3..83f1aff 100644
--- a/mvapich2.changes
+++ b/mvapich2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct  6 14:06:37 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Add conflicts between the macros-devel packages
+
 -------------------------------------------------------------------
 Thu Oct  5 13:30:48 UTC 2017 - nmoreychaisemartin@suse.com
 
diff --git a/mvapich2.spec b/mvapich2.spec
index 15d872a..364d5bd 100644
--- a/mvapich2.spec
+++ b/mvapich2.spec
@@ -254,7 +254,6 @@ is based on MPICH2 and MVICH. This package contains the static libraries
 Summary:        OSU MVAPICH2 MPI package - Documentation
 Group:          Development/Libraries/Parallel
 Requires:       %{name} = %{version}
-BuildArch:      noarch
 
 %description  doc
 This is an MPI-3 implementation which includes all MPI-1 and MPI-2 features.  It
@@ -266,7 +265,8 @@ is based on MPICH2 and MVICH. This package contains the static libraries
 Summary:        OSU MVAPICH2 MPI package - HPC build macros
 Group:          Development/Libraries/Parallel
 Requires:       %{name}-devel = %{version}
-BuildArch:      noarch
+Provides:       %{pname}-hpc-macros-devel = %{version}
+Conflicts:      otherproviders(%{pname}-hpc-macros-devel)
 
 %description macros-devel
 This is an MPI-3 implementation which includes all MPI-1 and MPI-2 features.  It