diff --git a/byacc.spec b/byacc.spec
index c4996c9..64da894 100644
--- a/byacc.spec
+++ b/byacc.spec
@@ -1,10 +1,18 @@
-%define byaccdate 20210808
+%define byaccdate 20241231
 
 Summary: Berkeley Yacc, a parser generator
 Name: byacc
 Version: 2.0.%{byaccdate}
-Release: 3%{?dist}
-License: Public Domain
+Release: 1%{?dist}
+
+# An SPDX license string check done against byacc-20230521 using fossology
+# found strings corresponding to the licenses noted below across the byacc
+# source tree.  byacc is in the public domain, and the "public domain
+# declaration" was documented in fedora-license-data as per Fedora policy
+# via the following commit:
+# https://gitlab.com/fedora/legal/fedora-license-data/-/commit/04ec53689413bb
+License: LicenseRef-Fedora-Public-Domain AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND X11 AND X11-distribute-modifications-variant AND FSFUL
+
 URL: http://invisible-island.net/byacc/byacc.html
 Source: ftp://invisible-island.net/byacc/byacc-%{byaccdate}.tgz
 
@@ -51,6 +59,54 @@ echo ====================TESTING END=====================
 %{_mandir}/man1/byacc.1*
 
 %changelog
+* Tue Sep 16 2025 Arjun Shankar <arjun@redhat.com> - 2.0.20241231-1
+- Rebase to byacc-2.0.20241231 (#2335136)
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20240109-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20240109-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20240109-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Mar 01 2024 Arjun Shankar <arjun@redhat.com> - 2.0.20240109-1
+- Rebase to byacc-2.0.20240109 (#2257541)
+
+* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20230521-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20230521-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Nov 08 2023 Arjun Shankar <arjun@redhat.com> - 2.0.20230521-3
+- Rebuilt to re-trigger automated bodhi (Fedora Updates System) tests
+
+* Thu Oct 26 2023 Arjun Shankar <arjun@redhat.com> - 2.0.20230521-2
+- Analyse byacc sources for license information
+- Migrate License field to SPDX identifiers for
+  https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2
+  (#2222081)
+
+* Thu Jun 29 2023 Arjun Shankar <arjun@redhat.com> - 2.0.20230521-1
+- Rebase to byacc-2.0.20230521 (#2208910)
+
+* Thu Feb 23 2023 Arjun Shankar <arjun@redhat.com> - 2.0.20230219-1
+- Rebase to byacc-2.0.20230219 (#2156901)
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20221106-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Nov 29 2022 Arjun Shankar <arjun@redhat.com> - 2.0.20221106-1
+- Rebase to byacc-2.0-20221106 (#2141488)
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20220128-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Feb 15 2022 Arjun Shankar <arjun@redhat.com> - 2.0-20220128-1
+- Rebase to byacc-2.0-20220128 (#2035590)
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20210808-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/plans/ci.fmf b/plans/ci.fmf
index 1ad2c12..3fd3ab7 100644
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@@ -1,6 +1,5 @@
 summary: CI Gating Plan
 discover:
     how: fmf
-    directory: tests
 execute:
-    how: beakerlib
+    how: tmt
diff --git a/sources b/sources
index 9d581c4..d745357 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (byacc-20210808.tgz) = cde092dbd845364752aca228a838b97fc34378c7dd7f860c614d13c8ec7167b8416422ded82864d22e8c3c447b47b30abca591ef8ab667c49f9fa070d68114c4
+SHA512 (byacc-20241231.tgz) = e4a9f50f1c9024bec697d2956f5fb431bef15a644a714adba8fa8fb2a5abd7aea6efb5d1b3fe5e775ec8cf6dae834da5533251fc77fb5c3f4e5b52ba60216498
diff --git a/tests/Regression/upstream-testsuite/runtest.sh b/tests/Regression/upstream-testsuite/runtest.sh
index 810849d..421687b 100755
--- a/tests/Regression/upstream-testsuite/runtest.sh
+++ b/tests/Regression/upstream-testsuite/runtest.sh
@@ -40,7 +40,7 @@ _BASEDIR=\$1
 _TMP=\$(mktemp -d)
 rpm --define="_topdir \$_TMP" -Uvh \$_BASEDIR/byacc*.src.rpm
 rpmbuild --define="_topdir \$_TMP" -bc \$_TMP/SPECS/byacc.spec
-pushd \$_TMP/BUILD/byacc-*
+pushd \$(find \$_TMP/BUILD/ -name yacc -type f -exec dirname {} \;)
 # In case the test fails, the existcode of make check is non-zero.
 # In such case this script fails too because of set -e above.
 make check
@@ -56,11 +56,7 @@ rlJournalStart
         rlRun "TMP=\$(mktemp -d)"
 	rlRun "chmod a+rx $TMP"
         rlRun "pushd $TMP"
-	if rlIsRHEL; then
-	    rlFetchSrcForInstalled $PACKAGE
-	else
-	    yumdownloader --source $PACKAGE
-	fi
+        rlFetchSrcForInstalled $PACKAGE
 	rlRun "chmod a+r byacc*.src.rpm"
     rlPhaseEnd