diff --git a/hdf5.changes b/hdf5.changes
index e797eb1..f2171a0 100644
--- a/hdf5.changes
+++ b/hdf5.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 26 15:51:18 UTC 2017 - eich@suse.com
+
+- Fix name: baselib.conf -> baselibs.conf
+
 -------------------------------------------------------------------
 Sun Oct 22 08:46:29 UTC 2017 - eich@suse.com
 
diff --git a/hdf5.spec b/hdf5.spec
index a759994..6982290 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -569,6 +569,30 @@ library packages.
 %patch7 -p1
 %patch8 -p1
 
+%if %{without hpc}
+# baselibs looks different for different flavors - generate it on the fly
+cat >  %{_sourcedir}/baselibs.conf <<EOF
+libhdf5-%{sonum}%{?my_suffix}
+libhdf5_hl%{sonum_HL}%{?my_suffix}
+libhdf5_fortran%{sonum_HL_F}%{?my_suffix}
+libhdf5hl_fortran%{sonum_HL_F}%{?my_suffix}
+%if %{without mpi}
+libhdf5_cpp%{sonum_CXX}%{?my_suffix}
+libhdf5_hl_cpp%{sonum_HL_CXX}%{?my_suffix}
+%endif
+hdf5%{?my_suffix}-devel
+   requires %{?my_suffix}-<targettype>
+   requires "libhdf5-%{sonum}%{?my_suffix}-<targettype> = <version>"
+   requires "libhdf5_hl%{sonum_HL}%{?my_suffix}-<targettype> = <version>"
+   requires "libhdf5_fortran%{sonum_HL_F}%{?my_suffix}-<targettype> = <version>"
+   requires "libhdf5hl_fortran%{sonum_HL_F}%{?my_suffix}-<targettype> = <version>"
+%if %{without mpi}
+   requires "libhdf5_cpp%{sonum_CXX}%{?my_suffix}-<targettype> = <version>"
+   requires "libhdf5_hl_cpp%{sonum_HL_CXX}%{?my_suffix}-<targettype> = <version>"
+%endif
+EOF
+%endif
+
 %build
 
 %{?with_hpc:%hpc_setup}
@@ -676,28 +700,7 @@ rm -rf %{buildroot}%{_datadir}/hdf5_examples
 %fdupes -s %{buildroot}/%{_datadir}
 %endif
 
-%if %{without hpc}
-# baselib looks different for different flavors - generate it on the fly
-cat >  %{_sourcedir}/baselib.conf <<EOF
-libhdf5-%{sonum}%{?my_suffix}
-libhdf5_hl%{sonum_HL}%{?my_suffix}
-libhdf5_fortran%{sonum_HL_F}%{?my_suffix}
-libhdf5hl_fortran%{sonum_HL_F}%{?my_suffix}
-%if %{without mpi}
-libhdf5_cpp%{sonum_CXX}%{?my_suffix}
-libhdf5_hl_cpp%{sonum_HL_CXX}%{?my_suffix}
-%endif
-hdf5%{?my_suffix}-devel
-   requires %{?my_suffix}-<targettype>
-   requires "libhdf5-%{sonum}%{?my_suffix}-<targettype> = <version>"
-   requires "libhdf5_hl%{sonum_HL}%{?my_suffix}-<targettype> = <version>"
-   requires "libhdf5_fortran%{sonum_HL_F}%{?my_suffix}-<targettype> = <version>"
-%if %{without mpi}
-   requires "libhdf5_cpp%{sonum_CXX}%{?my_suffix}-<targettype> = <version>"
-   requires "libhdf5_hl_cpp%{sonum_HL_CXX}%{?my_suffix}-<targettype> = <version>"
-%endif
-EOF
-%else
+%if %{with hpc}
 %{hpc_write_pkgconfig -n hdf5 -l libhdf5}
 %{hpc_write_pkgconfig -n hdf5_hl -l libhdf5_hl}
 %{hpc_write_pkgconfig -n hdf5_fortran -l libhdf5_fortran}