diff --git a/.gitignore b/.gitignore
index c076c65..e50a5bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,3 +95,4 @@ Module-CoreList-2.13.tar.gz
 /Module-CoreList-5.20210123.tar.gz
 /Module-CoreList-5.20210220.tar.gz
 /Module-CoreList-5.20210320.tar.gz
+/Module-CoreList-5.20240609.tar.gz
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..da7481a
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,19 @@
+# Fedora
+--- !Policy
+id: fedora_policy
+product_versions:
+  - fedora-*
+decision_contexts:
+  - bodhi_update_push_testing
+  - bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
+# RHEL
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/perl-Module-CoreList.spec b/perl-Module-CoreList.spec
index 97fc98e..7731a2b 100644
--- a/perl-Module-CoreList.spec
+++ b/perl-Module-CoreList.spec
@@ -1,8 +1,8 @@
 Name:           perl-Module-CoreList
 # Epoch to compete with perl.spec
 Epoch:          1
-Version:        5.20210320
-Release:        3%{?dist}
+Version:        5.20240609
+Release:        1%{?dist}
 Summary:        What modules are shipped with versions of perl
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/Module-CoreList
@@ -25,7 +25,6 @@ BuildRequires:  perl(List::Util)
 BuildRequires:  perl(version) >= 0.88
 # Tests:
 BuildRequires:  perl(Test::More)
-Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(List::Util)
 Requires:       perl(version) >= 0.88
 
@@ -64,28 +63,22 @@ with "%{_libexecdir}/%{name}/test".
 
 # Help file to recognise the Perl scripts and normalize shebangs
 for F in t/*.t; do
-    if head -1 "$F" | grep -q -e '^#!.*perl' ; then
-        perl -MConfig -pi -e 's|^#!.*perl\b|$Config{startperl}|' "$F"
-    else
-        perl -i -MConfig -ple 'print $Config{startperl} if $. == 1' "$F"
-    fi
+    perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F"
     chmod +x "$F"
 done
 
-# Remove release tests
-rm t/pod.t
-perl -i -ne 'print $_ unless m{^t/pod\.t}' MANIFEST
-
 %build
 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
 %{make_build}
 
 %install
 %{make_install}
+%{_fixperms} %{buildroot}/*
 
 # Install tests
 mkdir -p %{buildroot}/%{_libexecdir}/%{name}
 cp -a t %{buildroot}/%{_libexecdir}/%{name}
+rm -f %{buildroot}/%{_libexecdir}/%{name}/t/pod.t
 cat > %{buildroot}/%{_libexecdir}/%{name}/test << 'EOF'
 #!/bin/sh
 unset PERL_CORE
@@ -93,8 +86,6 @@ cd %{_libexecdir}/%{name} && exec prove -I . -j "$(getconf _NPROCESSORS_ONLN)"
 EOF
 chmod +x %{buildroot}/%{_libexecdir}/%{name}/test
 
-%{_fixperms} $RPM_BUILD_ROOT/*
-
 %check
 unset PERL_CORE
 export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}')
@@ -102,8 +93,8 @@ make test
 
 %files
 %doc Changes README
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%{perl_vendorlib}/Module
+%{_mandir}/man3/Module::CoreList*
 
 %files tools
 %doc README
@@ -114,6 +105,9 @@ make test
 %{_libexecdir}/%{name}
 
 %changelog
+* Tue Nov 19 2024 Jitka Plesnikova <jplesnik@redhat.com> - 1:5.20240609
+- Resolves: RHEL-5539 - 5.20240609 bump
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:5.20210320-3
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688
diff --git a/sources b/sources
index 71a40b8..9a93c7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Module-CoreList-5.20210320.tar.gz) = 62b4d10b0f75a360eb71c4f8b220998569e48df06bb503306f00c22afc6e0116c089660392938270daaf7260258a377bd719c8fee372101c8de09e4989f51260
+SHA512 (Module-CoreList-5.20240609.tar.gz) = c76fdf6a5c298c9967e7106ac2d6f3fb2c6afb9c3cb802ed764de36b75c63f387a8c55aa3637e08438bfdb612920ff759acebf4d2c5e708af313ed60b9795eb8
diff --git a/tests/upstream-tests.fmf b/tests/upstream-tests.fmf
index b8522dd..ddd2f21 100644
--- a/tests/upstream-tests.fmf
+++ b/tests/upstream-tests.fmf
@@ -1,4 +1,12 @@
 summary: Upstream tests
+contact: Jitka Plesnikova <jplesnik@redhat.com>
 component: perl-Module-CoreList
 require: perl-Module-CoreList-tests
 test: /usr/libexec/perl-Module-CoreList/test
+enabled: true
+tag:
+  - rhel-buildroot
+adjust:
+  - enabled: false
+    when: distro < rhel-9 or distro < centos-stream-9
+    continue: false