diff --git a/macros b/macros
index 1d571c5..c6d5729 100644
--- a/macros
+++ b/macros
@@ -372,7 +372,8 @@ print(result)
 # way we can detect installing an unusable .o/.a file.  This is on the TODO
 # list for F34.
 %_gcc_lto_cflags	-flto=auto -ffat-lto-objects
-%_clang_lto_cflags	-flto=thin
+# riscv64 does not have ld.gold support needed for LTO with Clang.
+%_clang_lto_cflags	%{nil}
 %_lto_cflags		%{expand:%%{_%{toolchain}_lto_cflags}}
 
 # Default fortification level.
diff --git a/macros.gap-srpm b/macros.gap-srpm
index 2221073..6ea1697 100644
--- a/macros.gap-srpm
+++ b/macros.gap-srpm
@@ -1,2 +1,2 @@
 # Arches that GAP runs on
-%gap_arches aarch64 ppc64le s390x x86_64
+%gap_arches aarch64 ppc64le s390x x86_64 riscv64
diff --git a/macros.java-srpm b/macros.java-srpm
index a32a7fd..4d35a9f 100644
--- a/macros.java-srpm
+++ b/macros.java-srpm
@@ -1,2 +1,2 @@
 # Arches that OpenJDK and dependent packages run on
-%java_arches aarch64 ppc64le s390x x86_64
+%java_arches aarch64 ppc64le s390x x86_64 riscv64
diff --git a/macros.nodejs-srpm b/macros.nodejs-srpm
index faf03a7..cb0f724 100644
--- a/macros.nodejs-srpm
+++ b/macros.nodejs-srpm
@@ -4,4 +4,4 @@
 # those arches. Support for POWER and aarch64 arrived in nodejs v4. Support
 # for s390x arrived in nodejs v6
 
-%nodejs_arches %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
+%nodejs_arches %{ix86} x86_64 %{arm} aarch64 %{power64} s390x riscv64
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 0ab5f91..87f30e2 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -9,7 +9,7 @@
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: %{baserelease}
-Release: 1%{?dist}
+Release: 1.0.riscv64%{?dist}
 # No version specified.
 License: GPL+
 URL: https://src.fedoraproject.org/rpms/redhat-rpm-config
@@ -254,6 +254,11 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
 %doc buildflags.md
 
 %changelog
+* Thu Jul 27 2023 David Abdurachmanov <davidlt@rivosinc.com> - 261-1.0.riscv64
+- Add riscv64 to %%gap_arches, %%java_arches, and %%nodejs_arches
+- Set %%_clang_lto_cflags to %%nil as ld.gold is not implemented for riscv64 
+  and thus LTO with Clang doesn't work.
+
 * Fri Jul  7 2023 Florian Weimer <fweimer@redhat.com> - 261-1
 - Fix warnings that appear during the build of the llvm package