diff --git a/baselibs.conf b/baselibs.conf
index 86b22c6..50299e9 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -5,11 +5,13 @@ mozilla-nss
   requires "libnssckbi.so"
 libsoftokn3
   requires "libfreebl3-<targettype> = <version>"
-libsoftokn3-hmac
+  provides "libsoftokn3-hmac-<targettype> = <version>-%release"
+  obsoletes "libsoftokn3-hmac-<targettype> < <version>-%release"
   +/usr/lib/libsoftokn3.chk
   +/usr/lib/libnssdbm3.chk
 libfreebl3
-libfreebl3-hmac
+  provides "libfreebl3-hmac-<targettype> = <version>-%release"
+  obsoletes "libfreebl3-hmac-<targettype> < <version>-%release"
   +/lib/libfreebl3.chk
   +/lib/libfreeblpriv3.chk
 mozilla-nss-sysinit
diff --git a/mozilla-nss.changes b/mozilla-nss.changes
index 7ae0145..df87f0c 100644
--- a/mozilla-nss.changes
+++ b/mozilla-nss.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun  9 10:41:35 UTC 2023 - Pedro Monreal <pmonreal@suse.com>
+
+- FIPS: Merge the libfreebl3-hmac and libsoftokn3-hmac packages
+  into the respective libraries. [bsc#1185116]
+
 -------------------------------------------------------------------
 Sat Jun  3 08:20:40 UTC 2023 - Wolfgang Rosenauer <wr@rosenauer.org>
 
diff --git a/mozilla-nss.spec b/mozilla-nss.spec
index b079c24..70ce11d 100644
--- a/mozilla-nss.spec
+++ b/mozilla-nss.spec
@@ -146,7 +146,8 @@ any system or user configured modules.
 %package -n libfreebl3
 Summary:        Freebl library for the Network Security Services
 Group:          System/Libraries
-Recommends:     libfreebl3-hmac = %{version}-%{release}
+Provides:       libfreebl3-hmac = %{version}-%{release}
+Obsoletes:      libfreebl3-hmac < %{version}-%{release}
 
 %description -n libfreebl3
 Network Security Services (NSS) is a set of libraries designed to
@@ -157,20 +158,12 @@ certificates, and other security standards.
 
 This package installs the freebl library from NSS.
 
-%package -n libfreebl3-hmac
-Summary:        Freebl library checksums for the Network Security Services
-Group:          System/Libraries
-Requires:       libfreebl3 = %{version}-%{release}
-
-%description -n libfreebl3-hmac
-Checksums for libraries contained in the libfreebl3 package
-used in the FIPS 140-2 mode.
-
 %package -n libsoftokn3
 Summary:        Network Security Services Softoken Module
 Group:          System/Libraries
 Requires:       libfreebl3 = %{version}-%{release}
-Recommends:     libsoftokn3-hmac = %{version}-%{release}
+Provides:       libsoftokn3-hmac = %{version}-%{release}
+Obsoletes:      libsoftokn3-hmac < %{version}-%{release}
 
 %description -n libsoftokn3
 Network Security Services (NSS) is a set of libraries designed to
@@ -181,15 +174,6 @@ certificates, and other security standards.
 
 Network Security Services Softoken Cryptographic Module
 
-%package -n libsoftokn3-hmac
-Summary:        Network Security Services Softoken Module checksums
-Group:          System/Libraries
-Requires:       libsoftokn3 = %{version}-%{release}
-
-%description -n libsoftokn3-hmac
-Checksums for libraries contained in the libsoftokn3 package
-used in the FIPS 140-2 mode.
-
 %package certs
 Summary:        CA certificates for NSS
 Group:          Productivity/Networking/Security
@@ -490,16 +474,12 @@ fi
 %files -n libfreebl3
 %{_libdir}/libfreebl3.so
 %{_libdir}/libfreeblpriv3.so
-
-%files -n libfreebl3-hmac
 %{_libdir}/libfreebl3.chk
 %{_libdir}/libfreeblpriv3.chk
 
 %files -n libsoftokn3
 %{_libdir}/libsoftokn3.so
 %{_libdir}/libnssdbm3.so
-
-%files -n libsoftokn3-hmac
 %{_libdir}/libsoftokn3.chk
 %{_libdir}/libnssdbm3.chk