diff --git a/gsl-rpmlintrc b/gsl-rpmlintrc
new file mode 100644
index 0000000..d30ee87
--- /dev/null
+++ b/gsl-rpmlintrc
@@ -0,0 +1,8 @@
+# HPC allows simultaneous installation of multiple versions of the same
+# library even with the same so-name. These are provided in non-system
+# directories which are not handled by entries to /etc/ld.so.conf but
+# by the well known concept of environment modules which allow users
+# to customize their runtime library stack per session.
+# Therefore, the package version, not the so version is used for
+# package names.
+addFilter(".*-hpc.*shlib-policy-name-error.*")
diff --git a/gsl.changes b/gsl.changes
index 67a46ee..1e5e0c2 100644
--- a/gsl.changes
+++ b/gsl.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May 24 20:48:30 UTC 2022 - Egbert Eich <eich@suse.com>
+
+- Add gsl-rpmlintrc rule to ignore shlib name policy errors for HPC
+  packages (see this file for explanation) (bsc#1191757).
+- Make doc package arch-independent.
+
 -------------------------------------------------------------------
 Fri May 14 13:31:41 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/gsl.spec b/gsl.spec
index ba651a5..6d452f0 100644
--- a/gsl.spec
+++ b/gsl.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package gsl
+# spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -120,6 +120,7 @@ URL:            https://www.gnu.org/software/%{pname}/
 Source0:        https://ftp.gnu.org/pub/gnu/%{pname}/%{pname}-%{version}.tar.gz
 Source1:        https://ftp.gnu.org/pub/gnu/%{pname}/%{pname}-%{version}.tar.gz.sig
 Source2:        https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=gsl&download=1#/%{pname}.keyring
+Source3:        gsl-rpmlintrc
 Patch6:         gsl-qawc-test-x86-precision.diff
 Patch7:         gsl-disable-fma.patch
 BuildRequires:  autoconf
@@ -219,6 +220,7 @@ Summary:        Documentation for the GNU Scientific Library
 Group:          Documentation/Other
 Requires(post): %{install_info_prereq}
 Requires(preun):%{install_info_prereq}
+BuildArch:      noarch
 
 %description    doc
 This package contains documentation for GSL
@@ -419,8 +421,11 @@ EOF
 %files doc
 %doc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
 %license COPYING
-%{?with_hpc:%hpc_dirs}
-%{?with_hpc:%dir %p_infodir}
+%if %{with hpc}
+%dir %{hpc_install_path_base}
+%dir %{hpc_install_path}
+%dir %{p_infodir}
+%endif
 %{p_infodir}/gsl-ref*
 
 %post doc