diff --git a/_multibuild b/_multibuild
index 55c830f..df9e226 100644
--- a/_multibuild
+++ b/_multibuild
@@ -3,6 +3,8 @@
   <package>openmpi</package>
   <package>mvapich2</package>
   <package>gnu-openmpi-hpc</package>
+  <package>gnu-openmpi3-hpc</package>
   <package>gnu-mvapich2-hpc</package>
+  <package>gnu-mpich-hpc</package>
   <package>gnu-hpc</package>
 </multibuild>
diff --git a/hdf5.changes b/hdf5.changes
index d632635..81eaad7 100644
--- a/hdf5.changes
+++ b/hdf5.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jan 12 15:38:59 UTC 2018 - eich@suse.com
+
+- Disable the openmpi3 flavor in some products.
+
+-------------------------------------------------------------------
+Fri Jan  5 18:34:20 UTC 2018 - eich@suse.com
+
+- Switch from gcc6 to gcc7 as additional compiler flavor for HPC on SLES.
+- Add support for mpich and openmpi3 for HPC.
+
 -------------------------------------------------------------------
 Thu Nov  9 15:02:35 UTC 2017 - normand@linux.vnet.ibm.com
 
diff --git a/hdf5.spec b/hdf5.spec
index 42f4905..c89caae 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package hdf5
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,6 +18,12 @@
 
 %global flavor @BUILD_FLAVOR@%{nil}
 
+%if 0%{?is_opensuse} || 0%{?is_backports}
+%undefine DisOMPI3
+%else
+%define DisOMPI3 ExclusiveArch:  do_not_build
+%endif
+
 #
 %define _do_check 1
 %define use_sz2 0
@@ -58,6 +64,7 @@ ExclusiveArch:  do_not_build
 %endif
 
 %if "%{flavor}" == "gnu-openmpi-hpc"
+%{?DisOMPI1}
 %bcond_without hpc
 %define compiler_family gnu
 %undefine c_f_ver
@@ -72,28 +79,61 @@ ExclusiveArch:  do_not_build
 %global mpi_flavor mvapich2
 %endif
 
-%if "%{flavor}" == "gnu6-hpc"
+%if "%{flavor}" == "gnu-openmpi3-hpc"
+%{?DisOMPI3}
 %bcond_without hpc
 %define compiler_family gnu
-%define c_f_ver 6
+%undefine c_f_ver
+%global mpi_flavor openmpi
+%define mpi_vers 3
+%endif
+
+%if "%{flavor}" == "gnu-mpich-hpc"
+%bcond_without hpc
+%define compiler_family gnu
+%undefine c_f_ver
+%global mpi_flavor mpich
+%endif
+
+%if "%{flavor}" == "gnu7-hpc"
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 7
 %undefine mpi_flavor
 %endif
 
-%if "%{flavor}" == "gnu6-openmpi-hpc"
+%if "%{flavor}" == "gnu7-openmpi-hpc"
+%{?DisOMPI1}
 %bcond_without hpc
 %define compiler_family gnu
-%define c_f_ver 6
+%define c_f_ver 7
 %global mpi_flavor openmpi
 %define mpi_vers 1
 %endif
 
-%if "%{flavor}" == "gnu6-mvapich2-hpc"
+%if "%{flavor}" == "gnu7-mvapich2-hpc"
 %bcond_without hpc
 %define compiler_family gnu
-%define c_f_ver 6
+%define c_f_ver 7
 %global mpi_flavor mvapich2
 %endif
 
+%if "%{flavor}" == "gnu7-openmpi3-hpc"
+%{?DisOMPI3}
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 7
+%global mpi_flavor openmpi
+%define mpi_vers 3
+%endif
+
+%if "%{flavor}" == "gnu7-mpich-hpc"
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 7
+%global mpi_flavor mpich
+%endif
+
 # Disable until resource issue is resolved.
 %if "%mpi_flavor" == "openmpi"
 %define _do_check 0