diff --git a/erlang.spec b/erlang.spec
index dd91d1f..6be4ff1 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -2,7 +2,7 @@
 
 %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}}
 
-%ifarch %{arm} %{mips}
+%ifarch %{arm} %{mips} riscv64
 # MIPS does not have all dependencies for fop yet
 # For some reason, fop hangs on arm, so for now don't generate docs by
 # default
@@ -60,7 +60,7 @@
 
 Name:		erlang
 Version:	20.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	General-purpose programming language and runtime environment
 
 Group:		Development/Languages
@@ -2214,6 +2214,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \
 
 
 %changelog
+* Tue Mar 20 2018 Richard W.M. Jones <rjones@redhat.com> - 20.3-2
+- Disable fop on riscv64.
+
 * Wed Mar 14 2018 Peter Lemenkov <lemenkov@gmail.com> - 20.3
 - Ver. 20.3