diff --git a/mumps.changes b/mumps.changes
index 8ab2a9c..5d24a39 100644
--- a/mumps.changes
+++ b/mumps.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Feb 27 22:08:16 UTC 2019 - Egbert Eich <eich@suse.com>
+
+- Use -Wl,--whole-archive .. -Wl,--no-whole-archive instead of unpacking
+  static library to build a shared library.
+- Add dependency to gcc-gfortran to non-HPC build of devel package.
+
 -------------------------------------------------------------------
 Wed Feb 27 18:29:25 UTC 2019 - Egbert Eich <eich@suse.com>
 
diff --git a/mumps.spec b/mumps.spec
index 8079705..2beab90 100644
--- a/mumps.spec
+++ b/mumps.spec
@@ -327,6 +327,7 @@ Requires:       blas-devel
 Requires:       lapack-devel
 %{?with_scotch:Requires:       scotch-devel}
  %endif # mpi
+Recommends:     gcc-fortran
 %else # hpc
 %hpc_requires_devel
 Requires:       libblacs2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc-devel
@@ -493,9 +494,9 @@ rm -f *.o; ar -x ../libmumps_common%{?PLAT}.a
      -lpthread %{MUMPS_LIBF77} -o ../libmumps_common%{?PLAT}.so.%{version}
 ln -s libmumps_common%{?PLAT}.so.%{version} ../libmumps_common%{?PLAT}.so
 for ARITH in c d s z ; do
-   rm -f *.o; ar -x ../lib${ARITH}mumps%{?PLAT}.a
-   %F_C -shared *.o -Wl,-soname,lib${ARITH}mumps%{?PLAT}.so.%{version} -L.. -lmumps_common%{?PLAT} \
-        %{LORDERINGS} %{MUMPS_LIBF77} %{LIBBLAS} %{?SCALAP} -o ../lib${ARITH}mumps%{?PLAT}.so.%{version}
+   %F_C -shared -Wl,--whole-archive ../lib${ARITH}mumps%{?PLAT}.a  -Wl,--no-whole-archive \
+       -Wl,-soname,lib${ARITH}mumps%{?PLAT}.so.%{version} -L.. -lmumps_common%{?PLAT} \
+       %{LORDERINGS} %{MUMPS_LIBF77} %{LIBBLAS} %{?SCALAP} -o ../lib${ARITH}mumps%{?PLAT}.so.%{version}
    ln -s lib${ARITH}mumps%{?PLAT}.so.%{version} ../lib${ARITH}mumps%{?PLAT}.so
 done
 cd -