diff --git a/ppp.spec b/ppp.spec
index de8598c..aacb384 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -2,7 +2,7 @@
 
 Name:    ppp
 Version: 2.4.9
-Release: 9%{?dist}
+Release: 9.0.riscv64%{?dist}
 Summary: The Point-to-Point Protocol daemon
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 URL:     http://www.samba.org/ppp
@@ -81,6 +81,20 @@ This package contains the header files for building plugins for ppp.
 
 tar -xJf %{SOURCE12}
 
+# Temporary, see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85142
+# This was fixed in GCC, but now we produce /lib64/lpd64d/ path.
+%ifarch riscv64
+sed -i'' \
+  -e 's|/$(shell gcc -print-multi-os-directory 2> /dev/null)|64|g' \
+  -e 's|/$(shell $(CC) -print-multi-os-directory 2> /dev/null)|64|g' \
+  pppd/plugins/radius/Makefile.linux \
+  pppd/plugins/pppol2tp/Makefile.linux \
+  pppd/plugins/Makefile.linux \
+  pppd/plugins/pppoatm/Makefile.linux \
+  pppd/plugins/rp-pppoe/Makefile.linux \
+  pppd/Makefile.linux
+%endif
+
 %build
 %configure --cflags="$RPM_OPT_FLAGS -fPIC -Wall -fno-strict-aliasing"
 %{make_build} LDFLAGS="%{?build_ldflags} -pie"
@@ -173,6 +187,9 @@ mkdir -p %{buildroot}%{_rundir}/ppp
 %doc PLUGINS
 
 %changelog
+* Tue Apr 25 2023 David Abdurachmanov <davidlt@rivosinc.com> - 2.4.9-9.0.riscv64
+- Add workaround for RISC-V (riscv64)
+
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.9-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild