diff --git a/samba.spec b/samba.spec
index b61d78f..4c18def 100644
--- a/samba.spec
+++ b/samba.spec
@@ -54,7 +54,7 @@
 
 # ppc64le excluded pending resolution of https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104172
 #%%ifarch aarch64 ppc64le s390x x86_64
-%ifarch aarch64 s390x x86_64
+%ifarch aarch64 s390x x86_64 riscv64
 %bcond_without vfs_cephfs
 %bcond_without ceph_mutex
 %else
@@ -77,7 +77,7 @@
 
 %if 0%{?fedora}
 
-%ifarch aarch64 ppc64le s390x x86_64
+%ifarch aarch64 ppc64le s390x x86_64 riscv64
 %bcond_without vfs_glusterfs
 %else
 %bcond_with vfs_glusterfs
@@ -106,7 +106,7 @@
 # Build vfs_io_uring module by default on 64bit Fedora
 %if 0%{?fedora} || 0%{?rhel} >= 8
 
-%ifarch aarch64 ppc64le s390x x86_64
+%ifarch aarch64 ppc64le s390x x86_64 riscv64
 %bcond_without vfs_io_uring
 %else
 %bcond_with vfs_io_uring
@@ -199,7 +199,7 @@
 
 Name:           samba
 Version:        %{samba_version}
-Release:        %{samba_release}%{?dist}
+Release:        %{samba_release}.0.riscv64%{?dist}
 
 %if 0%{?fedora}
 Epoch:          2
@@ -328,8 +328,10 @@ BuildRequires: zlib-devel >= 1.2.3
 BuildRequires: pkgconfig(libsystemd)
 
 %if 0%{?fedora} >= 37
+%ifnarch riscv64
 BuildRequires: mold
 %endif
+%endif
 
 %if %{with vfs_glusterfs}
 BuildRequires: glusterfs-api-devel >= 3.4.0.16
@@ -1255,12 +1257,18 @@ export python_LDFLAGS="$(echo %{__global_ldflags} | sed -e 's/-Wl,-z,defs//g')"
 
 # Use the mold linker
 %if 0%{?fedora} >= 37
+%ifnarch riscv64
 export LDFLAGS="%{__global_ldflags} -fuse-ld=mold"
 export python_LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-Wl,-z,defs//g')"
+%endif
 %else
 export python_LDFLAGS="$(echo %{__global_ldflags} | sed -e 's/-Wl,-z,defs//g')"
 %endif
 
+%ifarch riscv64
+export python_LDFLAGS="$(echo %{__global_ldflags} | sed -e 's/-Wl,-z,defs//g')"
+%endif
+
 %configure \
         --enable-fhs \
         --with-piddir=/run \
@@ -4337,6 +4345,10 @@ fi
 %endif
 
 %changelog
+* Mon Mar 20 2023 David Abdurachmanov <davidlt@rivosinc.com> - 4.18.0-10.0.riscv64
+- Add support for riscv64
+- Disable Mold linker on riscv64
+
 * Fri Mar 17 2023 Kalev Lember <klember@redhat.com> - 4.18.0-10
 - Move libstable-sort-samba4.so to samba-client-libs subpackage