diff --git a/mvapich2.changes b/mvapich2.changes
index 05939b4..628781d 100644
--- a/mvapich2.changes
+++ b/mvapich2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jul 25 07:03:57 UTC 2020 - Egbert Eich <eich@suse.com>
+
+- For HPC builds check for gnu compiler suite version >= 10 and
+  set -fallow-argument-mismatch.
+
 -------------------------------------------------------------------
 Thu Jul 23 15:53:00 UTC 2020 - Egbert Eich <eich@suse.com>
 
diff --git a/mvapich2.spec b/mvapich2.spec
index 73368ba..e072f78 100644
--- a/mvapich2.spec
+++ b/mvapich2.spec
@@ -405,7 +405,7 @@ cp /usr/share/automake*/config.* .
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
 
 # GCC10 needs an extra flag to allow badly passed parameters
-%if 0%{?suse_version} > 1500
+%if 0%{?suse_version} > 1500 || 0%{?hpc_gnu_dep_version} >= 10
 export FFLAGS="-fallow-argument-mismatch $FFLAGS"
 %endif