diff --git a/gmp.changes b/gmp.changes
index 18bae67..067857e 100644
--- a/gmp.changes
+++ b/gmp.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Apr 20 12:59:35 UTC 2021 - Richard Biener <rguenther@suse.com>
+
+- Compute FIPS hmac for libgmp.so.10 [bsc#1184555]
+
+-------------------------------------------------------------------
+Sat Apr 10 12:05:09 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- do not break SLE 12 build when applying spec-cleaner
+
 -------------------------------------------------------------------
 Wed Dec  9 07:24:19 UTC 2020 - Richard Biener <rguenther@suse.com>
 
diff --git a/gmp.spec b/gmp.spec
index 63e940d..1ba8211 100644
--- a/gmp.spec
+++ b/gmp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gmp
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,11 +16,12 @@
 #
 
 
+%{!?make_build: %define make_build make %{?_smp_mflags}}
 Name:           gmp
 Version:        6.2.1
 Release:        0
 Summary:        A library for calculating huge numbers
-License:        GPL-3.0-or-later AND (LGPL-3.0-or-later OR GPL-2.0-or-later)
+License:        (GPL-2.0-or-later OR LGPL-3.0-or-later) AND GPL-3.0-or-later
 Group:          Development/Libraries/C and C++
 URL:            https://gmplib.org/
 Source0:        https://gmplib.org/download/%{name}/%{name}-%{version}.tar.xz
@@ -29,6 +30,7 @@ Source2:        %{name}.keyring
 Source3:        baselibs.conf
 # revert change causing bsc#1179751
 Patch1:         gmp-6.2.1-arm64-invert_limb.patch
+BuildRequires:  fipscheck
 BuildRequires:  gcc-c++
 BuildRequires:  m4
 BuildRequires:  pkgconfig
@@ -41,7 +43,7 @@ available memory in the machine GMP runs on.
 
 %package -n libgmp10
 Summary:        A library for calculating huge numbers
-License:        LGPL-3.0-or-later OR GPL-2.0-or-later
+License:        GPL-2.0-or-later OR LGPL-3.0-or-later
 Group:          System/Libraries
 
 %description -n libgmp10
@@ -50,7 +52,7 @@ signed integers, rational numbers, and floating-point numbers.
 
 %package -n libgmpxx4
 Summary:        C++ bindings for the GNU MP Library
-License:        LGPL-3.0-or-later OR GPL-2.0-or-later
+License:        GPL-2.0-or-later OR LGPL-3.0-or-later
 Group:          System/Libraries
 Requires:       libgmp10 >= %{version}
 
@@ -62,12 +64,12 @@ This package contains C++ bindings for the GNU MP Library.
 
 %package devel
 Summary:        Include Files and Libraries for Development with the GNU MP Library
-License:        GPL-3.0-or-later AND (LGPL-3.0-or-later OR GPL-2.0-or-later)
+License:        (GPL-2.0-or-later OR LGPL-3.0-or-later) AND GPL-3.0-or-later
 Group:          Development/Languages/C and C++
 Requires:       libgmp10 = %{version}
 Requires:       libgmpxx4 = %{version}
 Requires(pre):  %{install_info_prereq}
-Requires(preun): %{install_info_prereq}
+Requires(preun):%{install_info_prereq}
 
 %description devel
 These libraries are needed to develop programs which calculate with
@@ -75,7 +77,7 @@ huge numbers (integer and floating point).
 
 %prep
 %setup -q
-%patch1 -p0
+%patch1
 
 %build
 export CFLAGS="%{optflags} -fexceptions"
@@ -83,21 +85,23 @@ export CFLAGS="%{optflags} -fexceptions"
   --disable-static \
   --enable-cxx \
   --enable-fat
-make %{?_smp_mflags}
+%make_build
 
 %check
 # do not disable "make check", FIX THE BUGS!
-make %{?_smp_mflags} check
+%make_build check
 
 %install
 %make_install
 rm %{buildroot}%{_libdir}/libgmp.la
 rm %{buildroot}%{_libdir}/libgmpxx.la
+export BRP_FIPSHMAC_FILES=%{buildroot}%{_libdir}/libgmp.so.10
 
 %post -n libgmp10 -p /sbin/ldconfig
 %post -n libgmpxx4 -p /sbin/ldconfig
 %postun -n libgmp10 -p /sbin/ldconfig
 %postun -n libgmpxx4 -p /sbin/ldconfig
+
 %post devel
 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
 
@@ -107,6 +111,7 @@ rm %{buildroot}%{_libdir}/libgmpxx.la
 %files -n libgmp10
 %license COPYING*
 %{_libdir}/libgmp.so.10*
+%{_libdir}/.libgmp.so.10.hmac
 
 %files -n libgmpxx4
 %{_libdir}/libgmpxx.so.4*