diff --git a/openssh.spec b/openssh.spec
index 578a2eb..afe431d 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -58,7 +58,7 @@
 Summary: An open source implementation of SSH protocol version 2
 Name: openssh
 Version: %{openssh_ver}
-Release: %{openssh_rel}%{?dist}
+Release: %{openssh_rel}.0.riscv64%{?dist}
 URL: http://www.openssh.com/portable.html
 #URL1: https://github.com/jbeverly/pam_ssh_agent_auth/
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -274,7 +274,7 @@ Requires: openssh = %{version}-%{release}
 %package -n pam_ssh_agent_auth
 Summary: PAM module for authentication with ssh-agent
 Version: %{pam_ssh_agent_ver}
-Release: %{pam_ssh_agent_rel}.%{openssh_rel}%{?dist}.2
+Release: %{pam_ssh_agent_rel}.%{openssh_rel}.0.riscv64%{?dist}.2
 License: BSD
 
 %description
@@ -451,7 +451,11 @@ fi
 	--with-pam \
 %if %{WITH_SELINUX}
 	--with-selinux --with-audit=linux \
+%ifnarch riscv64
 	--with-sandbox=seccomp_filter \
+%else
+	--with-sandbox=no \
+%endif
 %endif
 %if %{kerberos5}
 	--with-kerberos5${krb5_prefix:+=${krb5_prefix}} \
@@ -669,6 +673,9 @@ test -f %{sysconfig_anaconda} && \
 %endif
 
 %changelog
+* Tue Dec 01 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 8.4p1-4.0.riscv64 + 0.10.4-1.0.riscv64
+- Dissable seccomp_filter on riscv64
+
 * Tue Dec 01 2020 Jakub Jelen <jjelen@redhat.com> - 8.4p1-4 + 0.10.4-1
 - Remove "PasswordAuthentication yes" from vendor configuration as it is
   already default and it might be hard to override.