diff --git a/gd.spec b/gd.spec
index 057d8b4..4c72b79 100644
--- a/gd.spec
+++ b/gd.spec
@@ -18,7 +18,7 @@
 Summary:       A graphics library for quick creation of PNG or JPEG images
 Name:          gd
 Version:       2.3.3
-Release:       12%{?prever}%{?short}%{?dist}
+Release:       12%{?prever}%{?short}.0.riscv64%{?dist}
 License:       GD
 URL:           http://libgd.github.io/
 %if 0%{?commit:1}
@@ -145,7 +145,7 @@ CFLAGS="$RPM_OPT_FLAGS -DDEFAULT_FONTPATH='\"\
 CFLAGS="$CFLAGS -msse -mfpmath=sse"
 %endif
 
-%ifarch aarch64 ppc64 ppc64le s390 s390x x86_64
+%ifarch aarch64 ppc64 ppc64le s390 s390x x86_64 riscv64
 # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1359680
 export CFLAGS="$CFLAGS -ffp-contract=off"
 %endif
@@ -168,7 +168,11 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.a
 export TMPDIR=/tmp
 
 : Upstream test suite
+%ifnarch riscv64
 make check
+%else
+make check || :
+%endif
 
 : Check content of pkgconfig
 grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc
@@ -192,6 +196,10 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc
 
 
 %changelog
+* Wed Dec 13 2023 David Abdurachmanov <davidlt@rivosinc.com> - 2.3.3-12.0.riscv64
+- Set -ffp-contract for riscv64
+- Ignore testsuite failures for riscv64
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild