diff --git a/hdf5.changes b/hdf5.changes
index f5130d9..c71dbd4 100644
--- a/hdf5.changes
+++ b/hdf5.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov 28 18:13:10 UTC 2019 - Egbert Eich <eich@suse.com>
+
+- Add support for gcc8 and gcc9 (jsc#SLE-7766 & jsc#SLE-8609).
+
 -------------------------------------------------------------------
 Thu Nov 28 15:54:19 UTC 2019 - Egbert Eich <eich@suse.com>
 
diff --git a/hdf5.spec b/hdf5.spec
index 1d53f9f..a729002 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -21,7 +21,7 @@
 %if 0%{?sle_version} >= 150200
 %define DisOMPI1 ExclusiveArch:  do_not_build
 %endif
-%if 0%{!?is_opensuse:1} && 0%{?sle_version:1} && 0%{?sle_version} < 150200
+%if !0%{?is_opensuse} && 0%{?sle_version:1} && 0%{?sle_version} < 150200
 %define DisOMPI3 ExclusiveArch:  do_not_build
 %endif
 
@@ -160,6 +160,84 @@ ExclusiveArch:  do_not_build
 %global mpi_flavor mpich
 %endif
 
+%if "%{flavor}" == "gnu8-hpc"
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 8
+%undefine mpi_flavor
+%endif
+
+%if "%{flavor}" == "gnu8-openmpi-hpc"
+%{?DisOMPI1}
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 8
+%global mpi_flavor openmpi
+%define mpi_vers 1
+%endif
+
+%if "%{flavor}" == "gnu8-mvapich2-hpc"
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 8
+%global mpi_flavor mvapich2
+%endif
+
+%if "%{flavor}" == "gnu8-openmpi3-hpc"
+%{?DisOMPI3}
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 8
+%global mpi_flavor openmpi
+%define mpi_vers 3
+%endif
+
+%if "%{flavor}" == "gnu8-mpich-hpc"
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 8
+%global mpi_flavor mpich
+%endif
+
+%if "%{flavor}" == "gnu9-hpc"
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 9
+%undefine mpi_flavor
+%endif
+
+%if "%{flavor}" == "gnu9-openmpi-hpc"
+%{?DisOMPI1}
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 9
+%global mpi_flavor openmpi
+%define mpi_vers 1
+%endif
+
+%if "%{flavor}" == "gnu9-mvapich2-hpc"
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 9
+%global mpi_flavor mvapich2
+%endif
+
+%if "%{flavor}" == "gnu9-openmpi3-hpc"
+%{?DisOMPI3}
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 9
+%global mpi_flavor openmpi
+%define mpi_vers 3
+%endif
+
+%if "%{flavor}" == "gnu9-mpich-hpc"
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 9
+%global mpi_flavor mpich
+%endif
+
 # Don't build non-HPC on SLE
 %if !0%{?is_opensuse} && !0%{?with_hpc:1}
 ExclusiveArch:  do_not_build