diff --git a/mumps.changes b/mumps.changes
index 63aeb52..1fec7fa 100644
--- a/mumps.changes
+++ b/mumps.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Feb 14 18:24:28 UTC 2019 - Egbert Eich <eich@suse.com>
+
+- Ship header files with devel package for each HPC build (bsc#1125551).
+
+-------------------------------------------------------------------
+Thu Feb 14 00:37:16 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Add explicit Requires: for matching libblacs2-* to non-HPC library package 
+
 -------------------------------------------------------------------
 Thu Feb 14 09:11:45 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/mumps.spec b/mumps.spec
index 0661541..a2257ca 100644
--- a/mumps.spec
+++ b/mumps.spec
@@ -248,6 +248,9 @@ Summary:        A MUltifrontal Massively Parallel Sparse direct Solver
 Group:          System/Libraries
  %if %{without hpc}
 %{?with_mpi:Recommends:       %{name}-%{so_ver}-compat = %{version}}
+# Explicitly include this library here:
+# the solver doesn't have enough information to pick the correct MPI flavor
+%{?with_mpi:Requires:         libblacs2-%{mpi_family}%{?mpi_ver}}
  %else
 Requires:       libscalapack2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc
 %hpc_requires
@@ -510,12 +513,12 @@ mkdir -p %{buildroot}%{my_libdir}
 # install libs
 cp -P lib/lib*.a %{buildroot}%{my_libdir}
 cp -P lib/lib*.so* %{buildroot}%{my_libdir}
-%if %{without mpi} && %{without scotch}
-mkdir -p %{buildroot}%{_includedir}/mumps
-mkdir -p %{buildroot}%{_includedir}/pord
-install -m 644 include/* %{buildroot}%{_includedir}/mumps
-install -m 644 libseq/*.h %{buildroot}%{_includedir}/mumps
-install -m 644 PORD/include/* %{buildroot}%{_includedir}/pord
+%if %{with hpc} || %{without mpi} && %{without scotch}
+mkdir -p %{buildroot}%{my_incdir}/mumps
+mkdir -p %{buildroot}%{my_incdir}/pord
+install -m 644 include/* %{buildroot}%{my_incdir}/mumps
+install -m 644 libseq/*.h %{buildroot}%{my_incdir}/mumps
+install -m 644 PORD/include/* %{buildroot}%{my_incdir}/pord
 %endif
 install -m 755 examples/*simpletest %{buildroot}%{my_bindir}
 install -m 755 examples/c_example %{buildroot}%{my_bindir}
@@ -614,7 +617,8 @@ rm -rf examples/*.o examples/*simpletest examples/c_example examples/multiple_ar
 %endif # mpi && !hpc
 
 %files devel
- %if %{without scotch} && %{without mpi}
+ %if %{with hpc} || ( %{without scotch} && %{without mpi} )
+%{?with_hpc:%dir %{my_incdir}}
 %{my_incdir}/mumps
 %{my_incdir}/pord
  %endif