diff --git a/build/jam/repositories/HaikuPorts/riscv64 b/build/jam/repositories/HaikuPorts/riscv64
index 9f7120f3a2..ac088ab12c 100644
--- a/build/jam/repositories/HaikuPorts/riscv64
+++ b/build/jam/repositories/HaikuPorts/riscv64
@@ -14,30 +14,30 @@ RemotePackageRepository HaikuPorts
 	# repository architecture packages
 	# primary architecture (riscv64)
 	bash-4.4.023-1
-	binutils-2.28.1_2017_08_05-1
+	binutils-2.36.1_2021_09_21-2
 	bison-3.0.5-1
 	coreutils-8.22-1
 	curl-7.40.0-1
 	curl_devel-7.40.0-1
-	expat-2.1.0-1
-	expat_devel-2.1.0-1
+	expat-2.4.1-1
+	expat_devel-2.4.1-1
 	findutils-4.6.0-1
 	flex-2.5.35-1
 	freetype-2.6.3-1
 	freetype_devel-2.6.3-1
 	gawk-3.1.8-2
-	gcc-8.3.0_2019_05_24-4
-	gcc_syslibs_devel-8.3.0_2019_05_24-4
-	gcc_syslibs-8.3.0_2019_05_24-4
-	icu-57.2-2
-	icu_devel-57.2-2
+	gcc-11.2.0_2021_07_28-3
+	gcc_syslibs_devel-11.2.0_2021_07_28-3
+	gcc_syslibs-11.2.0_2021_07_28-3
+	icu-67.1-2
+	icu_devel-67.1-2
 	less-451-1
 	libsolv-0.3.0_haiku_2014_12_22-1
 	libsolv_devel-0.3.0_haiku_2014_12_22-1
 	m4-1.4.16-1
-	make-4.1-2
-	ncurses6-6.0-1
-	ncurses6_devel-6.0-1
+	make-4.3-1
+	ncurses6-6.2-1
+	ncurses6_devel-6.2-1
 	python-2.7.6-1
 	sed-4.2.1-1
 	texinfo-4.13a-1
diff --git a/build/jam/repositories/HaikuPortsCross/riscv64 b/build/jam/repositories/HaikuPortsCross/riscv64
index a42635622c..6e1fefc1ad 100644
--- a/build/jam/repositories/HaikuPortsCross/riscv64
+++ b/build/jam/repositories/HaikuPortsCross/riscv64
@@ -6,35 +6,37 @@ BootstrapPackageRepository HaikuPortsCross
 	noto-20170202-7
 	:
 	# repository architecture packages (stage 0)
-	gcc_bootstrap-8.3.0_2021_02_27-1
-	gcc_bootstrap_syslibs-8.3.0_2021_02_27-1
-	gcc_bootstrap_syslibs_devel-8.3.0_2021_02_27-1
+	gcc_bootstrap-11.2.0_2021_07_28-3
+	gcc_bootstrap_syslibs-11.2.0_2021_07_28-3
+	gcc_bootstrap_syslibs_devel-11.2.0_2021_07_28-3
 	:
 	# repository architecture packages (stage 1)
 	bash_bootstrap-4.4.023-1
-	binutils_bootstrap-2.28.1_2017_08_05-1
+	binutils_bootstrap-2.36.1_2021_09_21-2
 	bison_bootstrap-3.0.5-1
 	coreutils_bootstrap-8.22-1
 	curl_bootstrap-7.40.0-1
 	curl_bootstrap_devel-7.40.0-1
-	expat_bootstrap-2.1.0-1
-	expat_bootstrap_devel-2.1.0-1
+	expat_bootstrap-2.4.1-1
+	expat_bootstrap_devel-2.4.1-1
 	findutils_bootstrap-4.6.0-1
 	flex_bootstrap-2.5.35-1
 	freetype_bootstrap-2.6.3-1
 	freetype_bootstrap_devel-2.6.3-1
 	gawk_bootstrap-3.1.8-2
 	grep_bootstrap-2.14-1
-	icu_bootstrap-57.2-2
-	icu_bootstrap_devel-57.2-2
+	icu_bootstrap-67.1-2
+	icu_bootstrap_devel-67.1-2
 	less_bootstrap-451-1
 	m4_bootstrap-1.4.16-1
-	make_bootstrap-4.1-2
-	ncurses6_bootstrap-6.0-1
-	ncurses6_bootstrap_devel-6.0-1
+	make_bootstrap-4.3-1
+	ncurses6_bootstrap-6.2-1
+	ncurses6_bootstrap_devel-6.2-1
 	python_bootstrap-2.7.6-1
 	sed_bootstrap-4.2.1-1
 	texinfo_bootstrap-4.13a-1
+	zstd_bootstrap-1.5.0-2
+	zstd_bootstrap_devel-1.5.0-2
 	zlib_bootstrap-1.2.11-1
 	zlib_bootstrap_devel-1.2.11-1
 	:
@@ -63,6 +65,7 @@ BootstrapPackageRepository HaikuPortsCross
 	python_bootstrap
 	sed_bootstrap
 	texinfo_bootstrap
+	zstd_bootstrap
 	zlib_bootstrap
 	:
 	# debuginfo packages