diff --git a/ceph.spec b/ceph.spec
index 6e72214..679873d 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -36,7 +36,7 @@
 %bcond_with rbd_rwl_cache
 %endif
 %if 0%{?fedora} || 0%{?rhel}
-%ifarch s390x %{arm64}
+%ifarch s390x %{arm64} riscv64
 %bcond_with system_pmdk
 %else
 %bcond_without system_pmdk
@@ -160,7 +160,7 @@
 #################################################################################
 Name:		ceph
 Version:	17.2.6
-Release:	1%{?dist}
+Release:	1.0.riscv64%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
 %endif
@@ -281,7 +281,9 @@ BuildRequires:	snappy-devel
 BuildRequires:	sqlite-devel
 BuildRequires:	sudo
 BuildRequires:	pkgconfig(udev)
+%ifarch %{valgrind_arches}
 BuildRequires:	valgrind-devel
+%endif
 BuildRequires:	which
 BuildRequires:	xfsprogs-devel
 BuildRequires:	xmlstarlet
@@ -1334,6 +1336,10 @@ export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
 export LDFLAGS="$RPM_LD_FLAGS"
 
+%ifarch riscv64
+export LDFLAGS="-latomic $LDFLAGS"
+%endif
+
 # Workaround to https://tracker.ceph.com/issues/56610
 %if 0%{?fedora} >= 37 || 0%{?rhel} >= 10
 export CFLAGS="$RPM_OPT_FLAGS -DFMT_DEPRECATED_OSTREAM"
@@ -2617,6 +2623,9 @@ exit 0
 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
 
 %changelog
+* Tue Apr 18 2023 David Abdurachmanov <davidlt@rivosinc.com> - 2:17.2.6-1.0.riscv64
+- Enable riscv64
+
 * Fri Apr 7 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.2.6-1
 - ceph-17.2.6 GA