diff --git a/rust.spec b/rust.spec
index 9f4aa26..09ed67e 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 ppc64le s390x
+%global rust_arches x86_64 i686 armv7hl aarch64 ppc64le s390x riscv64
 
 # The channel can be stable, beta, or nightly
 %{!?channel: %global channel stable}
@@ -17,7 +17,7 @@
 # a waste of lookaside cache space when they're most often unused.
 # Run "spectool -g rust.spec" after changing this and then "fedpkg upload" to
 # add them to sources. Remember to remove them again after the bootstrap build!
-#global bootstrap_arches %%{rust_arches}
+%global bootstrap_arches %%{rust_arches}
 
 # Define a space-separated list of targets to ship rust-std-static-$triple for
 # cross-compilation. The packages are noarch, but they're not fully
@@ -76,15 +76,19 @@
 %endif
 
 # LLDB isn't available everywhere...
+%ifnarch riscv64
 %if 0%{?rhel} && 0%{?rhel} < 8
 %bcond_with lldb
 %else
 %bcond_without lldb
 %endif
+%else
+%bcond_with lldb
+%endif
 
 Name:           rust
 Version:        1.63.0
-Release:        1%{?dist}
+Release:        1.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)
@@ -658,7 +662,7 @@ find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+'
 %build
 %{export_rust_env}
 
-%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
@@ -1032,6 +1036,9 @@ end}
 
 
 %changelog
+* Fri Sep 02 2022 David Abdurachmanov <davidlt@rivosinc.com> - 1.63.0-1.0.riscv64
+- Bootstrap riscv64
+
 * Thu Aug 11 2022 Josh Stone <jistone@redhat.com> - 1.63.0-1
 - Update to 1.63.0.