diff --git a/zcash/riscv64.patch b/zcash/riscv64.patch
index bb2292830..5cfdeec2c 100644
--- a/zcash/riscv64.patch
+++ b/zcash/riscv64.patch
@@ -1,31 +1,34 @@
-diff --git PKGBUILD PKGBUILD
-index 4ac622b..cb688b7 100644
 --- PKGBUILD
 +++ PKGBUILD
-@@ -49,7 +49,7 @@ build() {
+@@ -21,12 +21,13 @@ sha256sums=('SKIP'
+             '7b0919ac447824199aff8c17b5a5799b46414818c6aed314506c5295d0ce9ccd')
  
-     CPPFLAGS="${CPPFLAGS} -I${srcdir}/db-root/include -I/usr/include/utf8cpp"
-     LDFLAGS="${LDFLAGS} -L${srcdir}/db-root/lib"
--    rust_target=$(RUSTC_BOOTSTRAP=1 rustc -Z unstable-options --print target-spec-json | python -c 'import json,sys;obj=json.load(sys.stdin);print(obj["llvm-target"])')
-+    rust_target="riscv64gc-unknown-linux-gnu"
+ get_rust_target() {
+-    RUSTC_BOOTSTRAP=1 rustc -Z unstable-options --print target-spec-json | python -c 'import json,sys;obj=json.load(sys.stdin);print(obj["llvm-target"])'
++    echo riscv64gc-unknown-linux-gnu
+ }
  
-     ./autogen.sh
-     ./configure --prefix=/usr \
-@@ -62,7 +62,7 @@ check() {
+ build() {
+     cd "db-${_db_version}/build_unix"
  
-     ./zcutil/fetch-params.sh
++    cp /usr/share/autoconf/build-aux/config.{guess,sub} ../dist
+     ../dist/configure \
+         --prefix=/ \
+         --disable-shared \
+@@ -39,11 +40,16 @@ build() {
  
--    rust_target=$(RUSTC_BOOTSTRAP=1 rustc -Z unstable-options --print target-spec-json | python -c 'import json,sys;obj=json.load(sys.stdin);print(obj["llvm-target"])')
-+    rust_target="riscv64gc-unknown-linux-gnu"
-     export RUST_TARGET="${rust_target}"
-     ./qa/zcash/full_test_suite.py || true
- }
-@@ -70,7 +70,7 @@ check() {
- package() {
-     cd ${pkgname}
+     cd "${srcdir}/${pkgname}"
  
--    rust_target=$(RUSTC_BOOTSTRAP=1 rustc -Z unstable-options --print target-spec-json | python -c 'import json,sys;obj=json.load(sys.stdin);print(obj["llvm-target"])')
-+    rust_target="riscv64gc-unknown-linux-gnu"
-     make DESTDIR="${pkgdir}" RUST_TARGET="${rust_target}" install
++    echo -e "\n[patch.crates-io]\nring = { git = 'https://github.com/felixonmars/ring', branch = '0.16.20' }" >> Cargo.toml
++    cargo update -p ring
++
+     CPPFLAGS="${CPPFLAGS} -I${srcdir}/db-root/include -I/usr/include/utf8cpp"
+     LDFLAGS="${LDFLAGS} -L${srcdir}/db-root/lib"
+ 
+     export CC=/usr/bin/clang
+     export CXX=/usr/bin/clang++
++    export CFLAGS=${CFLAGS/-fstack-clash-protection}
++    export CXXFLAGS=${CXXFLAGS/-fstack-clash-protection}
  
-     for ext in '-cli' '-tx' 'd'; do
+     ./autogen.sh
+     ./configure --prefix=/usr \