diff --git a/riscv-compressed-booti.patch b/riscv-compressed-booti.patch
new file mode 100644
index 0000000..68614c2
--- /dev/null
+++ b/riscv-compressed-booti.patch
@@ -0,0 +1,26 @@
+diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
+index aed9a4ae..07607710 100644
+--- a/include/configs/qemu-riscv.h
++++ b/include/configs/qemu-riscv.h
+@@ -56,6 +56,8 @@
+ 	"scriptaddr=0x88100000\0" \
+ 	"pxefile_addr_r=0x88200000\0" \
+ 	"ramdisk_addr_r=0x88300000\0" \
++	"kernel_comp_addr_r=0x90000000\0" \
++	"kernel_comp_size=0x4000000\0" \
+ 	BOOTENV
+ #endif
+ 
+diff --git a/include/configs/sifive-fu540.h b/include/configs/sifive-fu540.h
+index c1c79db1..9750381a 100644
+--- a/include/configs/sifive-fu540.h
++++ b/include/configs/sifive-fu540.h
+@@ -66,6 +66,8 @@
+ 	"script_size_f=0x1000\0" \
+ 	"pxefile_addr_r=0x88200000\0" \
+ 	"ramdisk_addr_r=0x88300000\0" \
++	"kernel_comp_addr_r=0x90000000\0" \
++	"kernel_comp_size=0x4000000\0" \
+ 	"type_guid_gpt_loader1=" TYPE_GUID_LOADER1 "\0" \
+ 	"type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \
+ 	"type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \
diff --git a/riscv-set-nrcpus-32.patch b/riscv-set-nrcpus-32.patch
new file mode 100644
index 0000000..82c8c55
--- /dev/null
+++ b/riscv-set-nrcpus-32.patch
@@ -0,0 +1,36 @@
+diff --git a/configs/qemu-riscv64_defconfig b/configs/qemu-riscv64_defconfig
+index daf5d655..aa79abc1 100644
+--- a/configs/qemu-riscv64_defconfig
++++ b/configs/qemu-riscv64_defconfig
+@@ -13,3 +13,4 @@ CONFIG_CMD_NVEDIT_EFI=y
+ CONFIG_OF_PRIOR_STAGE=y
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+ CONFIG_DM_MTD=y
++CONFIG_NR_CPUS=32
+diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig
+index 0000564e..459011a2 100644
+--- a/configs/qemu-riscv64_smode_defconfig
++++ b/configs/qemu-riscv64_smode_defconfig
+@@ -14,3 +14,4 @@ CONFIG_CMD_NVEDIT_EFI=y
+ CONFIG_OF_PRIOR_STAGE=y
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+ CONFIG_DM_MTD=y
++CONFIG_NR_CPUS=32
+diff --git a/configs/qemu-riscv64_spl_defconfig b/configs/qemu-riscv64_spl_defconfig
+index 897adf6a..56a84832 100644
+--- a/configs/qemu-riscv64_spl_defconfig
++++ b/configs/qemu-riscv64_spl_defconfig
+@@ -14,3 +14,4 @@ CONFIG_DISPLAY_BOARDINFO=y
+ CONFIG_OF_PRIOR_STAGE=y
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+ CONFIG_DM_MTD=y
++CONFIG_NR_CPUS=32
+diff --git a/configs/sifive_fu540_defconfig b/configs/sifive_fu540_defconfig
+index e4dd2018..5d3ee8da 100644
+--- a/configs/sifive_fu540_defconfig
++++ b/configs/sifive_fu540_defconfig
+@@ -27,3 +27,4 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
+ CONFIG_SPL_CLK=y
+ CONFIG_DM_MTD=y
+ CONFIG_DM_RESET=y
++CONFIG_NR_CPUS=32
diff --git a/uboot-tools.spec b/uboot-tools.spec
index 2d0e32b..36b7ccc 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -5,7 +5,7 @@
 
 Name:     uboot-tools
 Version:  2020.10
-Release:  2%{?candidate:.%{candidate}}.4.riscv64%{?dist}
+Release:  2%{?candidate:.%{candidate}}.5.riscv64%{?dist}
 Summary:  U-Boot utilities
 License:  GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
 URL:      http://www.denx.de/wiki/U-Boot
@@ -44,6 +44,13 @@ Patch14:  rk3399-Pinebook-pro-EDP-support.patch
 Patch15:  rk3399-reset-display-hack.patch
 Patch16:  rockchip-Rock960-Fix-up-USB-support.patch
 
+# RISC-V (riscv64) patches
+# Add support for loading Image.{gz,xz,..} kernels with booti command
+Patch20:  riscv-compressed-booti.patch
+
+# Set max CPUs to 32 (same as Linux)
+Patch21:  riscv-set-nrcpus-32.patch
+
 BuildRequires:  bc
 BuildRequires:  dtc
 BuildRequires:  make
@@ -291,6 +298,10 @@ cp -p board/warp7/README builds/docs/README.warp7
 %endif
 
 %changelog
+* Thu Jan 07 2021 David Abdurachmanov <david.abdurachmanov@sifive.com> - 2020.10-2.5.riscv64
+- Increase max CPU to 32 (same as Linux)
+- Add compressed Image.{gz,xz,..} kernel support for booti command
+
 * Thu Jan 07 2021 David Abdurachmanov <david.abdurachmanov@sifive.com> - 2020.10-2.4.riscv64
 - Remove u-boot-initial-env