diff --git a/mvapich2.changes b/mvapich2.changes
index 8ea2d43..05939b4 100644
--- a/mvapich2.changes
+++ b/mvapich2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jul 23 15:53:00 UTC 2020 - Egbert Eich <eich@suse.com>
+
+- Add build support for gcc8/9/10 to HPC build (bsc#1174439).
+
 -------------------------------------------------------------------
 Wed Jun  3 08:13:07 UTC 2020 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
 
diff --git a/mvapich2.spec b/mvapich2.spec
index d01f3b9..73368ba 100644
--- a/mvapich2.spec
+++ b/mvapich2.spec
@@ -113,6 +113,90 @@ ExclusiveArch:  do_not_build
 %{bcond_without hpc}
 %endif
 
+%if "%flavor" == "gnu8-hpc"
+%define compiler_family gnu
+%define c_f_ver 8
+%define build_flavor verbs
+%{bcond_without hpc}
+%endif
+%if "%flavor" == "gnu8-hpc-testsuite"
+%define compiler_family gnu
+%define c_f_ver 8
+%define testsuite 1
+%define build_flavor verbs
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu8-hpc-psm"
+%define compiler_family gnu
+%define c_f_ver 8
+%define build_flavor psm
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu8-hpc-psm2"
+%define compiler_family gnu
+%define c_f_ver 8
+%define build_flavor psm2
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu9-hpc"
+%define compiler_family gnu
+%define c_f_ver 9
+%define build_flavor verbs
+%{bcond_without hpc}
+%endif
+%if "%flavor" == "gnu9-hpc-testsuite"
+%define compiler_family gnu
+%define c_f_ver 9
+%define testsuite 1
+%define build_flavor verbs
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu9-hpc-psm"
+%define compiler_family gnu
+%define c_f_ver 9
+%define build_flavor psm
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu9-hpc-psm2"
+%define compiler_family gnu
+%define c_f_ver 9
+%define build_flavor psm2
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu10-hpc"
+%define compiler_family gnu
+%define c_f_ver 10
+%define build_flavor verbs
+%{bcond_without hpc}
+%endif
+%if "%flavor" == "gnu10-hpc-testsuite"
+%define compiler_family gnu
+%define c_f_ver 10
+%define testsuite 1
+%define build_flavor verbs
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu10-hpc-psm"
+%define compiler_family gnu
+%define c_f_ver 10
+%define build_flavor psm
+%{bcond_without hpc}
+%endif
+
+%if "%flavor" == "gnu10-hpc-psm2"
+%define compiler_family gnu
+%define c_f_ver 10
+%define build_flavor psm2
+%{bcond_without hpc}
+%endif
+
 %if "%{build_flavor}" != "verbs"
 %define pack_suff %{?build_flavor:-%{build_flavor}}
 %endif