diff --git a/libkcapi.spec b/libkcapi.spec
index a37e9cd..e215942 100644
--- a/libkcapi.spec
+++ b/libkcapi.spec
@@ -5,7 +5,12 @@
 
 # Do we build the replacements packages?
 %bcond_with replace_coreutils
+# Replace fipscheck by default in Fedora 33+:
+%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
+%bcond_without replace_fipscheck
+%else
 %bcond_with replace_fipscheck
+%endif
 # Replace hmaccalc by default in Fedora 28+:
 %if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
 %bcond_without replace_hmaccalc
@@ -56,8 +61,7 @@
 
 # Do we replace fipscheck?
 %if %{with replace_fipscheck}
-# TODO: Adapt this when replacing fipscheck initially.
-%global fipscheck_evr     1.5.0-3%{?dist}
+%global fipscheck_evr     1.5.0-9
 %endif
 
 # Do we replace hmaccalc?
@@ -451,6 +455,7 @@ popd
 %changelog
 * Wed Apr 22 2020 Sahana Prasad <sahana@redhat.com> - 1.1.5-3
 - Disables kcapi-enc tests until the kernel bug bz 1826022 is fixed.
+- Produce also the fipscheck replacement package
 
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild