diff --git a/kernel-srpm-macros.spec b/kernel-srpm-macros.spec
index 18d977d..058c08e 100644
--- a/kernel-srpm-macros.spec
+++ b/kernel-srpm-macros.spec
@@ -1,7 +1,7 @@
 Name:           kernel-srpm-macros
 Version:        1.0
 # when bumping version and resetting release, don't forget to bump version of kernel-rpm-macros as well
-Release:        20%{?dist}
+Release:        27%{?dist}
 Summary:        RPM macros that list arches the full kernel is built on
 # This package only exist in Fedora repositories
 # The license is the standard (MIT) specified in
@@ -56,6 +56,8 @@ The variable to use is kernel_arches.
 %package -n kernel-rpm-macros
 Version: 205
 Summary: Macros and scripts for building kernel module packages
+# rpmsort is GPL-2.0-or-later
+License:        MIT AND GPL-2.0-or-later
 Requires: redhat-rpm-config >= 205
 
 # for brp-kmod-compress
@@ -92,7 +94,7 @@ cp -p %{sources} .
 mkdir -p %{buildroot}/%{_rpmconfigdir}/macros.d
 install -p -m 0644 -t %{buildroot}/%{_rpmconfigdir}/macros.d macros.kernel-srpm
 %if 0%{?rhel} >= 8
-  sed -i 's/^%%kernel_arches.*/%%kernel_arches x86_64 s390x ppc64le aarch64/' \
+  sed -i 's/^%%kernel_arches.*/%%kernel_arches x86_64 s390x ppc64le aarch64 riscv64/' \
     %{buildroot}/%{_rpmconfigdir}/macros.d/macros.kernel-srpm
 %endif
 
@@ -134,6 +136,27 @@ install -p -m 644 -t "%{buildroot}%{_fileattrsdir}" modalias.attr
 %{rrcdir}/rpmsort
 
 %changelog
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue Apr 01 2025 Andrea Bolognani <abologna@redhat.com> - 1.0-26
+- Finish adding riscv64 (thanks Zhengyu He)
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Mar 06 2024 David Abdurachmanov <davidlt@rivosinc.com> - 1.0-23
+- Add riscv64
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/macros.kernel-srpm b/macros.kernel-srpm
index c7110f6..5f6bb98 100644
--- a/macros.kernel-srpm
+++ b/macros.kernel-srpm
@@ -1,3 +1,3 @@
 # kernel_arches lists what arches the full kernel is built for.
 
-%kernel_arches x86_64 s390x ppc64le aarch64 %{arm}
+%kernel_arches x86_64 s390x ppc64le aarch64 %{arm} riscv64
diff --git a/macros.kmp b/macros.kmp
index 00c0467..fdfc182 100644
--- a/macros.kmp
+++ b/macros.kmp
@@ -59,7 +59,7 @@ redhat_kmp_has_post_hooks	1
 	%global kmodtool %{-s*}%{!-s:/usr/lib/rpm/redhat/kmodtool} \
 	%global kmod_version %{-v*}%{!-v:%{version}} \
 	%global kmod_release %{-r*}%{!-r:%{release}} \
-	%global latest_kernel %({ rpm -q --qf '%%{VERSION}-%%{RELEASE}.%%{ARCH}\\\\n' `rpm -qa | egrep "^kernel(-rt|-aarch64)?-devel" | /usr/lib/rpm/redhat/rpmsort -r | head -n 1`; echo '%%%%{nil}'; } | head -n 1) \
+	%global latest_kernel %({ rpm -q --qf '%%{VERSION}-%%{RELEASE}.%%{ARCH}\\\\n' kernel-rt-devel kernel-aarch64-devel kernel-devel | grep -v 'is not installed' | /usr/lib/rpm/redhat/rpmsort -r | head -n 1; echo '%%%%{nil}'; } | head -n 1) \
 	%{!?kernel_version:%{expand:%%global kernel_version %{latest_kernel}}} \
 	%global kverrel %(%{kmodtool} verrel %{?kernel_version} 2>/dev/null) \
 	flavors="default" \