diff --git a/10-devicetree.install b/10-devicetree.install
index 3345391..fdea5ec 100755
--- a/10-devicetree.install
+++ b/10-devicetree.install
@@ -2,7 +2,7 @@
 
 # set -x
 
-if [[ "$(uname -m)" == arm* || "$(uname -m)" == aarch64 ]]
+if [[ "$(uname -m)" == arm* || "$(uname -m)" == aarch64 || "$(uname -m)" == riscv64 ]]
 then
 COMMAND="$1"
 KERNEL_VERSION="$2"
diff --git a/grubby.spec b/grubby.spec
index c6e0b42..63167c8 100644
--- a/grubby.spec
+++ b/grubby.spec
@@ -3,7 +3,7 @@
 
 Name: grubby
 Version: 8.40
-Release: 81%{?dist}
+Release: 82%{?dist}
 Summary: Command line tool for updating bootloader configs
 License: GPL-2.0-or-later
 Source1: grubby-bls
@@ -21,7 +21,7 @@ BuildRequires: pkgconfig
 BuildRequires: popt-devel
 BuildRequires: rpm-devel
 BuildRequires: sed
-%ifarch aarch64 x86_64 %{power64}
+%ifarch aarch64 x86_64 %{power64} riscv64
 BuildRequires: grub2-tools-minimal
 Requires: grub2-tools-minimal
 Requires: grub2-tools
@@ -74,6 +74,10 @@ fi
 %{_mandir}/man8/grubby.8*
 
 %changelog
+* Wed Apr 16 2025 Andrea Bolognani <abologna@redhat.com> - 8.40-82
+- Fix riscv64 build
+  Resolves: RHEL-85989
+
 * Thu Mar 20 2025 Leo Sandoval <lsandova@redhat.com> - 8.40-81
 - grubby-bls: in s390* systems, run zipl on grub cfg update event
   Fixes previous commit and formats better the conditions that trigger grub cfg updates