diff --git a/zig.spec b/zig.spec
index 83bf246..0e6dfc1 100644
--- a/zig.spec
+++ b/zig.spec
@@ -38,6 +38,9 @@ Patch:          0003-fetch-prevent-global-cache-from-being-copied.patch
 Patch:          0004-cmake-correct-PIE-support-detection-add-error-output.patch
 # Remove native libr directories from rpath
 Patch:          0005-remove-native-lib-directories-from-rpath.patch
+# Backport from upstream to fix riscv64 bootstrap
+# https://github.com/ziglang/zig/pull/21474
+Patch:		b2357a4f9ed42d85e2b7dfaab8802ae2b05af475.patch
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++