diff --git a/macros b/macros
index f5c0bb5..264c194 100644
--- a/macros
+++ b/macros
@@ -392,9 +392,11 @@ for k,_ in pairs(stripped_flags) do print(k .. " ") end
 # to verify they have real sections/symbols after LTO stripping.  That
 # 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
-%_lto_cflags		%{expand:%%{_%{toolchain}_lto_cflags}}
+# LTO is slow on riscv64, we want to prioritize build speeds for now.
+%_gcc_lto_cflags	%{nil}
+# riscv64 does not have ld.gold support needed for LTO with Clang.
+%_clang_lto_cflags	%{nil}
+%_lto_cflags		%{nil}
 
 # Default fortification level.
 #   "%define _fortify_level 2" to downgrade and
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 faa9885..a29f93f 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}
 # config.guess, config.sub are GPL-3.0-or-later WITH Autoconf-exception-generic
 License: GPL-1.0-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later WITH Autoconf-exception-generic AND Boehm-GC
 URL: https://src.fedoraproject.org/rpms/redhat-rpm-config
@@ -262,6 +262,11 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora common.lua
 %doc buildflags.md
 
 %changelog
+* Thu Apr 25 2024 David Abdurachmanov <davidlt@rivosinc.com> - 286-1.0.riscv64
+- Add riscv64 to %%gap_arches, %%java_arches, and %%nodejs_arches
+- Disable LTO for Clang on riscv64 (no ld.gold support for riscv64)
+- Disable LTO in general on riscv64 (lowers packages build time)
+
 * Tue Mar 12 2024 Omair Majid <omajid@redhat.com> - 286-1
 - Define %%dotnet_arches with a list of .NET-compatible architectures