diff --git a/kernel.spec b/kernel.spec
index 08df4de2a..96906df28 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -169,7 +169,7 @@ Summary: The Linux kernel
 # This is needed to do merge window version magic
 %define patchlevel 8
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 300%{?buildid}.3.riscv64%{?dist}
+%define specrelease 300%{?buildid}.4.riscv64%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.8.7
 
@@ -720,7 +720,7 @@ BuildRequires: zlib-devel binutils-devel
 %endif
 %if %{with_selftests}
 BuildRequires: clang llvm-devel fuse-devel
-%ifarch x86_64
+%ifarch x86_64 riscv64
 BuildRequires: lld
 %endif
 BuildRequires: libcap-devel libcap-ng-devel rsync libmnl-devel
@@ -3972,6 +3972,9 @@ fi\
 #
 #
 %changelog
+* Fri Apr 26 2024 David Abdurachmanov <davidlt@rivosinc.com> [6.8.7-0.4.riscv64]
+- Add LLD (ld.lld) for riscv64
+
 * Thu Apr 25 2024 David Abdurachmanov <davidlt@rivosinc.com> [6.8.7-0.3.riscv64]
 - Update riscv64 configuration (StarFive VF2)