diff --git a/ppp.spec b/ppp.spec
index 12d2add..d5f9e97 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -3,7 +3,7 @@
 Summary: The Point-to-Point Protocol daemon
 Name: ppp
 Version: 2.4.7
-Release: 21%{?dist}
+Release: 21.0.riscv64%{?dist}
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 Group: System Environment/Daemons
 URL: http://www.samba.org/ppp
@@ -81,6 +81,19 @@ This package contains the header files for building plugins for ppp.
 %setup -q
 %autopatch -p1
 
+# Temporary, see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85142
+%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
+
 tar -xJf %{SOURCE12}
 
 %build
@@ -175,6 +188,9 @@ install -p %{SOURCE11} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifdo
 %doc PLUGINS
 
 %changelog
+* Mon May 28 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 2.4.7-21.0.riscv64
+- Add workaround for RISC-V (riscv64)
+
 * Mon Apr  9 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2.4.7-21
 - Link with -E not to break plugins
   Resolves: rhbz#1564459