diff --git a/nbdkit.spec b/nbdkit.spec
index ef7e40d..f5c0230 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -562,7 +562,9 @@ autoreconf -i
 
 %build
 %configure \
+%ifarch riscv64
     OCAMLOPTFLAGS="-fPIC" \
+%endif
     PYTHON=%{_bindir}/python3 \
     --disable-static \
 %if 0%{?have_libguestfs}
@@ -892,7 +894,8 @@ make %{?_smp_mflags} check || {
 
 %changelog
 * Fri Nov 15 2019 Richard W.M. Jones <rjones@redhat.com> - 1.16.0-3
-- Pass -fPIC to ocamlopt (needed on riscv64).
+- Pass -fPIC to ocamlopt on riscv64 only.
+  Probably a workaround for broken OCaml codegen on riscv64.
 
 * Fri Nov 15 2019 Richard W.M. Jones <rjones@redhat.com> - 1.16.0-2
 - Enable libvirt plugin on all architectures.