diff --git a/_multibuild b/_multibuild
index c5f5ea5..dc3a9bb 100644
--- a/_multibuild
+++ b/_multibuild
@@ -2,5 +2,7 @@
   <package>standard</package>
   <package>gnu-hpc</package>
   <package>gnu-openmpi-hpc</package>
+  <package>gnu-openmpi3-hpc</package>
   <package>gnu-mvapich2-hpc</package>
+  <package>gnu-mpich-hpc</package>
 </multibuild>
diff --git a/fftw3.changes b/fftw3.changes
index 8baa79c..94f98fb 100644
--- a/fftw3.changes
+++ b/fftw3.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Jan 12 15:33:40 UTC 2018 - eich@suse.com
+
+- Disable the openmpi3 flavor in some products.
+
+-------------------------------------------------------------------
+Fri Jan  5 18:32:30 UTC 2018 - eich@suse.com
+
+- Add gcc7 as additional compiler flavor for HPC on SLES.
+- Fix library package requires - use HPC macro (boo#1074890).
+- Add support for mpich and openmpi3 for HPC.
+
 -------------------------------------------------------------------
 Tue Nov 14 16:23:54 UTC 2017 - eich@suse.com
 
diff --git a/fftw3.spec b/fftw3.spec
index e8ed313..ffff66a 100644
--- a/fftw3.spec
+++ b/fftw3.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fftw3
 #
-# 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
@@ -27,6 +27,12 @@
 
 %bcond_with ringdisabled
 
+%if 0%{?is_opensuse} || 0%{?is_backports}
+%undefine DisOMPI3
+%else
+%define DisOMPI3 ExclusiveArch:  do_not_build
+%endif
+
 %if "%flavor" == ""
 ExclusiveArch:  do_not_build
 %define package_name %pname
@@ -55,6 +61,7 @@ ExclusiveArch:  do_not_build
 %endif
 
 %if "%{flavor}" == "gnu-openmpi-hpc"
+%{?DisOMPI1}
 %global compiler_family gnu
 %undefine c_f_ver
 %global mpi_flavor openmpi
@@ -63,6 +70,16 @@ ExclusiveArch:  do_not_build
 %bcond_without mpi
 %endif
 
+%if "%{flavor}" == "gnu-openmpi3-hpc"
+%{?DisOMPI3}
+%global compiler_family gnu
+%undefine c_f_ver
+%global mpi_flavor openmpi
+%define mpi_vers 3
+%bcond_without hpc
+%bcond_without mpi
+%endif
+
 %if "%{flavor}" == "gnu-mvapich2-hpc"
 %global compiler_family gnu
 %undefine c_f_ver
@@ -71,6 +88,57 @@ ExclusiveArch:  do_not_build
 %bcond_without mpi
 %endif
 
+%if "%{flavor}" == "gnu-mpich-hpc"
+%global compiler_family gnu
+%undefine c_f_ver
+%define mpi_flavor mpich
+%bcond_without hpc
+%bcond_without mpi
+%endif
+
+%if "%flavor" == "gnu7-hpc"
+%define compiler_family gnu
+%undefine c_f_ver 7
+%bcond_with mpi
+%bcond_without hpc
+%endif
+
+%if "%{flavor}" == "gnu7-openmpi-hpc"
+%{?DisOMPI1}
+%global compiler_family gnu
+%define c_f_ver 7
+%global mpi_flavor openmpi
+%define mpi_vers 1
+%bcond_without hpc
+%bcond_without mpi
+%endif
+
+%if "%{flavor}" == "gnu7-openmpi3-hpc"
+%{?DisOMPI3}
+%global compiler_family gnu
+%define c_f_ver 7
+%global mpi_flavor openmpi
+%define mpi_vers 3
+%bcond_without hpc
+%bcond_without mpi
+%endif
+
+%if "%{flavor}" == "gnu7-mvapich2-hpc"
+%global compiler_family gnu
+%define c_f_ver 7
+%define mpi_flavor mvapich2
+%bcond_without hpc
+%bcond_without mpi
+%endif
+
+%if "%{flavor}" == "gnu7-mpich-hpc"
+%global compiler_family gnu
+%define c_f_ver 7
+%define mpi_flavor mpich
+%bcond_without hpc
+%bcond_without mpi
+%endif
+
 # now exchange the paths
 %if %{with hpc}
 %{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}}
@@ -172,7 +240,6 @@ Group:          System/Libraries
 Provides:       fftw3 = %{version}-%{release}
 Obsoletes:      fftw3 < 3.3
 %if %{with hpc}
-Requires:       lua-lmod
 %hpc_requires
 %endif