diff --git a/u-boot-2019.04-rc4-riscv-bootz-fat.patch b/u-boot-2019.04-rc4-riscv-bootz-fat.patch
new file mode 100644
index 0000000..1bb5b5f
--- /dev/null
+++ b/u-boot-2019.04-rc4-riscv-bootz-fat.patch
@@ -0,0 +1,10 @@
+diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig
+index b012443..0ccc933 100644
+--- a/configs/qemu-riscv64_smode_defconfig
++++ b/configs/qemu-riscv64_smode_defconfig
+@@ -9,3 +9,5 @@ CONFIG_DISPLAY_CPUINFO=y
+ CONFIG_DISPLAY_BOARDINFO=y
+ # CONFIG_CMD_MII is not set
+ CONFIG_OF_PRIOR_STAGE=y
++CONFIG_CMD_BOOTZ=y
++CONFIG_CMD_FAT=y
diff --git a/uboot-tools.spec b/uboot-tools.spec
index c82482a..409363e 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -30,6 +30,9 @@ Patch12:   ARM-tegra-Add-NVIDIA-Jetson-Nano-Developer-Kit-support.patch
 Patch13:   tegra-p2371-2180-Build-position-independent-binary.patch
 Patch14:   net-eth-uclass-Write-MAC-address-to-hardware-after-probe.patch
 
+# RISC-V (riscv64)
+Patch30:   u-boot-2019.04-rc4-riscv-bootz-fat.patch
+
 BuildRequires:  bc
 BuildRequires:  dtc
 BuildRequires:  make