diff --git a/rust.spec b/rust.spec
index ff6e95f..759b3d6 100644
--- a/rust.spec
+++ b/rust.spec
@@ -1,6 +1,6 @@
 # Only x86_64 and i686 are Tier 1 platforms at this time.
 # https://doc.rust-lang.org/nightly/rustc/platform-support.html
-%global rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x
+%global rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x riscv64
 
 # The channel can be stable, beta, or nightly
 %{!?channel: %global channel stable}
@@ -9,13 +9,13 @@
 # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
 # or nightly wants some beta-YYYY-MM-DD
 # Note that cargo matches the program version here, not its crate version.
-%global bootstrap_rust 1.50.0
-%global bootstrap_cargo 1.50.0
-%global bootstrap_channel 1.50.0
-%global bootstrap_date 2021-02-11
+%global bootstrap_rust 1.51.0
+%global bootstrap_cargo 1.51.0
+%global bootstrap_channel 1.51.0
+%global bootstrap_date 2021-03-23
 
 # Only the specified arches will use bootstrap binaries.
-#global bootstrap_arches %%{rust_arches}
+%global bootstrap_arches %%{rust_arches}
 
 # Using llvm-static may be helpful as an opt-in, e.g. to aid LLVM rebases.
 %bcond_with llvm_static
@@ -48,12 +48,16 @@
 %if 0%{?rhel} && 0%{?rhel} < 8
 %bcond_with lldb
 %else
+%ifnarch riscv64
 %bcond_without lldb
+%else
+%bcond_with lldb
+%endif
 %endif
 
 Name:           rust
 Version:        1.51.0
-Release:        2%{?dist}
+Release:        2.0.riscv64%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
@@ -515,7 +519,7 @@ export %{rust_env}
 %global common_libdir %{_prefix}/lib
 %global rustlibdir %{common_libdir}/rustlib
 
-%ifarch %{arm} %{ix86} s390x
+%ifarch %{arm} %{ix86} s390x riscv64
 # full debuginfo is exhausting memory; just do libstd for now
 # https://github.com/rust-lang/rust/issues/45854
 %if 0%{?rhel} && 0%{?rhel} < 8
@@ -755,6 +759,9 @@ export %{rust_env}
 
 
 %changelog
+* Fri Apr 16 2021 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1.51.0-2.0.riscv64
+- Add riscv64
+
 * Wed Apr 14 2021 Josh Stone <jistone@redhat.com> - 1.51.0-2
 - Security fixes for CVE-2021-28876, CVE-2021-28878, CVE-2021-28879
 - Fix bootstrap for stage0 rust 1.51