diff --git a/hdf5-wrappers.patch b/hdf5-wrappers.patch
new file mode 100644
index 0000000..d199bb1
--- /dev/null
+++ b/hdf5-wrappers.patch
@@ -0,0 +1,109 @@
+diff -Naur hdf5-1.10.8.orig/bin/h5cc.in hdf5-1.10.8/bin/h5cc.in
+--- hdf5-1.10.8.orig/bin/h5cc.in	2022-04-07 18:23:46.000000000 -0600
++++ hdf5-1.10.8/bin/h5cc.in	2022-04-07 18:24:04.000000000 -0600
+@@ -89,10 +89,10 @@
+ # paths and libraries from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in
+ # from the hdf5 build. The order of the flags is intended to give precedence
+ # to the user's flags.
+-H5BLD_CFLAGS="@AM_CFLAGS@ @CFLAGS@"
++H5BLD_CFLAGS=
+ H5BLD_CPPFLAGS="@AM_CPPFLAGS@ @CPPFLAGS@"
+-H5BLD_LDFLAGS="@AM_LDFLAGS@ @LDFLAGS@"
+-H5BLD_LIBS="@LIBS@"
++H5BLD_LDFLAGS=
++H5BLD_LIBS=
+ 
+ CC="${HDF5_CC:-$CCBASE}"
+ CLINKER="${HDF5_CLINKER:-$CLINKERBASE}"
+@@ -105,7 +105,8 @@
+ # available library is shared, it will be used by default.  The user can
+ # override either default, although choosing an unavailable library will result
+ # in link errors.
+-STATIC_AVAILABLE="@enable_static@"
++# openSUSE prefers shared libraries
++STATIC_AVAILABLE=no
+ if test "${STATIC_AVAILABLE}" = "yes"; then
+   USE_SHARED_LIB="${HDF5_USE_SHLIB:-no}"
+ else
+@@ -385,7 +386,7 @@
+   # paths and libraries from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in
+   # from the hdf5 build. The order of the flags is intended to give precedence
+   # to the user's flags.
+-  $SHOW $CLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args $shared_link
++  $SHOW $CLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args
+   status=$?
+ fi
+ 
+diff -Naur hdf5-1.10.8.orig/c++/src/h5c++.in hdf5-1.10.8/c++/src/h5c++.in
+--- hdf5-1.10.8.orig/c++/src/h5c++.in	2022-04-07 18:23:45.000000000 -0600
++++ hdf5-1.10.8/c++/src/h5c++.in	2022-04-07 18:24:04.000000000 -0600
+@@ -87,10 +87,10 @@
+ # paths and libraries from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in
+ # from the hdf5 build. The order of the flags is intended to give precedence
+ # to the user's flags.
+-H5BLD_CXXFLAGS="@AM_CXXFLAGS@ @CXXFLAGS@"
++H5BLD_CXXFLAGS=
+ H5BLD_CPPFLAGS="@AM_CPPFLAGS@ @CPPFLAGS@"
+-H5BLD_LDFLAGS="@AM_LDFLAGS@ @LDFLAGS@"
+-H5BLD_LIBS="@LIBS@"
++H5BLD_LDFLAGS=
++H5BLD_LIBS=
+ 
+ CXX="${HDF5_CXX:-$CXXBASE}"
+ CXXLINKER="${HDF5_CXXLINKER:-$CXXLINKERBASE}"
+@@ -103,7 +103,8 @@
+ # available library is shared, it will be used by default.  The user can
+ # override either default, although choosing an unavailable library will result
+ # in link errors.
+-STATIC_AVAILABLE="@enable_static@"
++# openSUSE prefers shared libraries
++STATIC_AVAILABLE=no
+ if test "${STATIC_AVAILABLE}" = "yes"; then
+   USE_SHARED_LIB="${HDF5_USE_SHLIB:-no}"
+ else
+@@ -385,7 +386,7 @@
+   # from the hdf5 build. The order of the flags is intended to give precedence
+   # to the user's flags.
+ 
+-  $SHOW $CXXLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CXXFLAGS $CXXFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args $shared_link
++  $SHOW $CXXLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CXXFLAGS $CXXFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args
+ 
+   status=$?
+ fi
+diff -Naur hdf5-1.10.8.orig/fortran/src/h5fc.in hdf5-1.10.8/fortran/src/h5fc.in
+--- hdf5-1.10.8.orig/fortran/src/h5fc.in	2022-04-07 18:23:46.000000000 -0600
++++ hdf5-1.10.8/fortran/src/h5fc.in	2022-04-07 18:24:04.000000000 -0600
+@@ -83,11 +83,11 @@
+ # libraries in $link_args, followed by any external library paths and libraries
+ # from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in from the hdf5 build.
+ # The order of the flags is intended to give precedence to the user's flags.
+-H5BLD_FCFLAGS="@AM_FCFLAGS@ @FCFLAGS@"
++H5BLD_FCFLAGS=
+ F9XMODFLAG="@F9XMODFLAG@"
+ F9XSUFFIXFLAG="@F9XSUFFIXFLAG@"
+-H5BLD_LDFLAGS="@AM_LDFLAGS@ @LDFLAGS@"
+-H5BLD_LIBS="@LIBS@"
++H5BLD_LDFLAGS=
++H5BLD_LIBS=
+ 
+ FC="${HDF5_FC:-$FCBASE}"
+ FLINKER="${HDF5_FLINKER:-$FLINKERBASE}"
+@@ -99,7 +99,8 @@
+ # available library is shared, it will be used by default.  The user can
+ # override either default, although choosing an unavailable library will result
+ # in link errors.
+-STATIC_AVAILABLE="@enable_static@"
++# openSUSE prefers shared libraries
++STATIC_AVAILABLE=no
+ if test "${STATIC_AVAILABLE}" = "yes"; then
+   USE_SHARED_LIB="${HDF5_USE_SHLIB:-no}"
+ else
+@@ -363,7 +364,7 @@
+   # libraries in $link_args, followed by any external library paths and libraries
+   # from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in from the hdf5 build.
+   # The order of the flags is intended to give precedence to the user's flags.
+-  $SHOW $FLINKER $FCFLAGS $H5BLD_FCFLAGS $F9XSUFFIXFLAG $LDFLAGS $fmodules $link_objs $LIBS $link_args $shared_link
++  $SHOW $FLINKER $FCFLAGS $H5BLD_FCFLAGS $F9XSUFFIXFLAG $LDFLAGS $fmodules $link_objs $LIBS $link_args
+   status=$?
+ fi
+ 
diff --git a/hdf5.changes b/hdf5.changes
index 2a421db..1f70bb9 100644
--- a/hdf5.changes
+++ b/hdf5.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr  7 23:51:05 UTC 2022 - Christoph Junghans <junghans@votca.org>
+
+- add hdf5-wrappers.patch from Fedora, so strip flags from
+  wrappers and prefer shared linking
+- add missing zlib-devel devel dep
+
 -------------------------------------------------------------------
 Thu Mar 31 08:25:44 UTC 2022 - Ben Greiner <code@bnavigator.de>
 
diff --git a/hdf5.spec b/hdf5.spec
index f19c39e..5e99004 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -438,6 +438,8 @@ Patch7:         hdf5-mpi.patch
 Patch8:         Disable-phdf5-tests.patch
 # boo#1179521, boo#1196682, gh#HDFGroup/hdf5#1494
 Patch9:         hdf5-1.10.8-pr1494-fix-release-check-version.patch
+# Imported from Fedora, strip flags from h5cc wrapper 
+Patch10:        hdf5-wrappers.patch
 BuildRequires:  fdupes
 %if 0%{?use_sz2}
 BuildRequires:  libsz2-devel
@@ -604,6 +606,7 @@ Requires:       %{libname -l _cpp -s %{sonum_CXX}} = %{version}
 Requires:       %{libname -l _hl_cpp -s %{sonum_HL_CXX}} = %{version}
 Requires:       %{name} = %{version}
 %{!?with_hpc:Requires:       %{pname}-devel-data = %{version}}
+Requires:       zlib-devel
 %if 0%{?use_sz2}
 Requires:       libsz2-devel
 %endif
@@ -678,6 +681,7 @@ library packages.
 # %%patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %if %{without hpc}
 # baselibs looks different for different flavors - generate it on the fly