diff --git a/Jamfile b/Jamfile
index 1b92829781..72d2ccabbe 100644
--- a/Jamfile
+++ b/Jamfile
@@ -20,25 +20,28 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 # Include required packages:
 # primary architecture
 AddHaikuImageSystemPackages [ FFilterByBuildFeatures
-	bash bc coreutils curl freetype icu libsolv zlib zstd
+	bash bc coreutils freetype libsolv zlib
 
+	!gcc2 @{ icu66 }@
+	gcc2 @{ icu icu66_x86@secondary_x86 }@
 	regular_image @{
-		bzip2 diffutils expat ffmpeg findutils gawk glu grep gutenprint8
-		gzip
+		bzip2 diffutils expat ffmpeg findutils glu gutenprint8 gzip
 		lame less libedit libicns
-		mesa mesa_devel mesa_swpipe@!gcc2 mesa_swrast@gcc2
+		mawk mesa mesa_devel mesa_swpipe@!gcc2 mesa_swrast@gcc2
 		netcat
 		sed sharutils
-		tar tcpdump unzip wget which zip
+		tcpdump unzip wget which zip
+
+		!gcc2 @{ grep tar zstd }@
+		gcc2 @{ grep_x86@secondary_x86 tar_x86@secondary_x86 }@
 	}@
 ] ;
 AddHaikuImageSourcePackages [ FFilterByBuildFeatures
 	bash bc coreutils
 
 	regular_image @{
-		expat ffmpeg findutils gawk grep gutenprint8
-		gzip
-		lame less libicns
+		expat ffmpeg findutils grep gutenprint8 gzip
+		lame less libicns mawk
 		sed sharutils
 		tar wget which
 	}@
@@ -54,7 +57,7 @@ if $(HAIKU_PACKAGING_ARCHS[2]) {
 			in [ MultiArchSubDirSetup $(HAIKU_PACKAGING_ARCHS[2-]) ] {
 		on $(architectureObject) {
 			AddHaikuImageSystemPackages [ FFilterByBuildFeatures
-				curl freetype icu libsolv zlib
+				freetype icu libsolv zlib
 
 				regular_image @{
 					ffmpeg glu jasper jpeg libicns libpng16 libwebp mesa
diff --git a/ReadMe.Compiling.md b/ReadMe.Compiling.md
index 4afa6808b1..16f841ab68 100644
--- a/ReadMe.Compiling.md
+++ b/ReadMe.Compiling.md
@@ -31,7 +31,7 @@ nightly builds.
  * `makeinfo` (part of `texinfo`, only needed for building GCC 4)
  * `autoheader` (part of `autoconf`, needed for building GCC)
  * `automake` (needed for building GCC)
- * `gawk`
+ * `awk` (GNU awk is most tested, but other implementations should work)
  * `nasm`
  * `wget`
  * `[un]zip`
diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index d146360015..702c8bf105 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -83,22 +83,20 @@ rule DefineDefaultBuildProfiles
 				bepdf
 				keymapswitcher
 				mandoc
-				nano
 				noto
 				noto_sans_cjk_jp
 				openssh
-				p7zip
 				pdfwriter
 				pe
-				python
 				timgmsoundfont
 				vision
 				wpa_supplicant
 				wqy_microhei
-				# xz_utils can't be built with gcc2, so we install it for
-				# primary gcc 8 architectures or gcc 2 hybrids.
-				xz_utils@!gcc2
-				gcc2 @{ xz_utils_x86@secondary_x86 }@
+				# Some packages can't be built with gcc2, so we install the gcc8
+				# secondary architecture package instead in this case
+				!gcc2 @{ nano p7zip python3 xz_utils }@
+				gcc2 @{ nano_x86@secondary_x86 p7zip_x86@secondary_x86
+					python3_x86@secondary_x86 xz_utils_x86@secondary_x86 }@
 				;
 			AddHaikuImageSourcePackages
 				bepdf
@@ -137,18 +135,20 @@ rule DefineDefaultBuildProfiles
 
 			AddHaikuImageSystemPackages
 				mandoc
-				nano
 				noto
 				openssh
 				openssl
-				p7zip
 				pe
 				vision
 				wpa_supplicant
 				# xz_utils can't be built with gcc2, so we install it for
-				# primary gcc 4 architectures or gcc 2 hybrids.
-				xz_utils@!gcc2
-				gcc2 @{ xz_utils_x86@secondary_x86 }@
+				# primary gcc 8 architectures or gcc 2 hybrids.
+				!gcc2 @{ nano p7zip xz_utils }@
+				gcc2 @{
+					nano_x86@secondary_x86
+					p7zip_x86@secondary_x86
+					xz_utils_x86@secondary_x86
+				}@
 				;
 			AddHaikuImageSourcePackages
 				nano
@@ -187,7 +187,6 @@ rule DefineDefaultBuildProfiles
 				bison
 				expat
 				flex
-				gawk
 				gcc
 				grep
 				haikuporter
@@ -195,15 +194,17 @@ rule DefineDefaultBuildProfiles
 				libedit
 				m4
 				make
+				mawk
 				ncurses6
 				noto
 				python
 				sed
 				texinfo
+				!gcc2 @{ grep }@
+				gcc2 @{ grep_x86@secondary_x86 }@
 				;
 
 			AddHaikuImageDisabledPackages
-				curl_devel
 				freetype_devel
 				libedit_devel
 				ncurses6_devel
@@ -217,18 +218,16 @@ rule DefineDefaultBuildProfiles
 				on $(architectureObject) {
 					AddHaikuImageSystemPackages
 						binutils
-						curl
 						expat
 						freetype
 						gcc
-						icu
+						icu@gcc2 icu66@!gcc2
 						libsolv
 						libedit
 						ncurses6
 						zlib
 						;
 					AddHaikuImageDisabledPackages
-						curl_devel
 						freetype_devel
 						libedit_devel
 						ncurses6_devel
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 75719a8e6a..792e2dc0ac 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -76,7 +76,7 @@ if [ IsOptionalHaikuImagePackageAdded Development ] {
 	local architectureObject ;
 	for architectureObject in [ MultiArchSubDirSetup ] {
 		on $(architectureObject) {
-			AddHaikuImageDisabledPackages curl_devel openssl_devel nghttp2_devel
+			AddHaikuImageDisabledPackages openssl_devel
 				libjpeg_turbo_devel libpng16_devel zlib_devel ;
 		}
 	}
@@ -89,13 +89,15 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] {
 	local architectureObject ;
 	for architectureObject in [ MultiArchSubDirSetup ] {
 		on $(architectureObject) {
-			AddHaikuImageDisabledPackages binutils gcc mpc gmp mpfr ;
-			AddHaikuImageSourcePackages binutils gcc mpc gmp mpfr ;
+			AddHaikuImageDisabledPackages binutils gcc !gcc2 @{ mpc mpfr }@ ;
+			AddHaikuImageSystemPackages gmp@!gcc2 ;
+			AddHaikuImageSourcePackages binutils gcc !gcc2 @{ gmp mpc mpfr }@ ;
 		}
 	}
 
 	# other commonly used tools
-	AddHaikuImageDisabledPackages bison cdrtools flex jam m4 make mkdepend nasm patch ;
+	AddHaikuImageDisabledPackages bison cdrtools flex jam m4 make mawk mkdepend
+		nasm@!gcc2 nasm_x86@secondary_x86 patch ;
 	AddHaikuImageSourcePackages bison cdrtools m4 make patch ;
 }
 
diff --git a/build/jam/UserBuildConfig.ReadMe b/build/jam/UserBuildConfig.ReadMe
index 980bcd7dba..2cd650469d 100644
--- a/build/jam/UserBuildConfig.ReadMe
+++ b/build/jam/UserBuildConfig.ReadMe
@@ -212,7 +212,7 @@ switch $(HAIKU_BUILD_PROFILE) {
 	case "disk" : {
 		AddOptionalHaikuImagePackages BeBook BeHappy Bluetooth Development
 			OpenSSH OpenSSL Welcome ;
-		AddHaikuImageSystemPackages bepdf cvs p7zip pe subversion vision wonderbrush ;
+		AddHaikuImageSystemPackages bepdf git p7zip pe vision wonderbrush ;
 	}
 
 	case "qemu" : {
diff --git a/build/jam/repositories/HaikuPorts/x86_64 b/build/jam/repositories/HaikuPorts/x86_64
index 3170e80c28..9c5511ddc2 100644
--- a/build/jam/repositories/HaikuPorts/x86_64
+++ b/build/jam/repositories/HaikuPorts/x86_64
@@ -4,10 +4,10 @@ RemotePackageRepository HaikuPorts
 	:
 	# architecture "any" packages
 	be_book-2008_10_26-3
-	ca_root_certificates-2020_01_01-1
+	ca_root_certificates-2021_01_19-1
 	gnu_efi_kernel-3.0.10-1
 	haikuporter-1.2.3-2
-	noto-20170920-4
+	noto-20200106-1
 	noto_sans_cjk_jp-1.004-2
 	timgmsoundfont-fixed-5
 	wqy_microhei-0.2.0~beta-4
@@ -15,59 +15,74 @@ RemotePackageRepository HaikuPorts
 	# repository architecture packages
 	# primary architecture (x86_64)
 	autoconf-2.69-8
-	automake-1.16.2-1
-	bash-5.0.017-1
+	automake-1.16.3-1
+	bash-5.1-1
 	bc-1.07.1-2
 	bepdf-2.1.2-1
 	binutils-2.31.1-2
-	bison-3.5.4-1
+	bison-3.7.6-1
 	bzip2-1.0.8-1
 	bzip2_devel-1.0.8-1
 	cdrtools-3.02~a09-1
 	cdrtools_devel-3.02~a09-1
 	coreutils-8.29-2
 	ctags-5.8-5
-	curl-7.70.0-2
-	curl_devel-7.70.0-2
+	curl-7.74.0-1
+	curl_devel-7.74.0-1
+	dav1d-0.8.2-1
+	dav1d_devel-0.8.2-1
 	diffutils-3.7-1
-	expat-2.2.9-1
-	expat_devel-2.2.9-1
-	ffmpeg-4.2.2-3
-	ffmpeg_devel-4.2.2-3
-	findutils-4.7.0-1
-	flex-2.6.4-1
+	enca-1.19-2
+	enca_devel-1.19-2
+	expat-2.2.10-1
+	expat_devel-2.2.10-1
+	fdk_aac-2.0.1-1
+	ffmpeg-4.2.2-9
+	ffmpeg_devel-4.2.2-9
+	file-5.39-2
+	file_data-5.39-2
+	findutils-4.8.0-1
+	flex-2.6.4-2
 	fluidlite-1.0.0-3
 	fluidlite_devel-1.0.0-3
 	fontconfig-2.13.92-1
 	fontconfig_devel-2.13.92-1
-	freetype-2.9.1-2
-	freetype_devel-2.9.1-2
-	gawk-5.1.0-1
+	freetype-2.10.4-3
+	freetype_devel-2.10.4-3
+	fribidi-1.0.10-1
+	fribidi_devel-1.0.10-1
+	game_music_emu-0.6.3-1
+	game_music_emu_devel-0.6.3-1
+	gettext-0.19.8.1-7
 	gettext_libintl-0.19.8.1-7
-	gcc-8.3.0_2019_05_24-7
-	gcc_syslibs-8.3.0_2019_05_24-7
-	gcc_syslibs_devel-8.3.0_2019_05_24-7
+	gcc-8.3.0_2019_05_24-9
+	gcc_syslibs-8.3.0_2019_05_24-9
+	gcc_syslibs_devel-8.3.0_2019_05_24-9
 	giflib-5.2.1-1
 	giflib_devel-5.2.1-1
-	git-2.26.0-2
-	git_arch-2.26.0-2
-	git_cvs-2.26.0-2
-	git_daemon-2.26.0-2
-	git_email-2.26.0-2
-	git_svn-2.26.0-2
+	git-2.30.2-2
+	git_arch-2.30.2-2
+	git_cvs-2.30.2-2
+	git_daemon-2.30.2-2
+	git_email-2.30.2-2
+	git_svn-2.30.2-2
 	glu-9.0.0-7
 	glu_devel-9.0.0-7
-	gmp-6.1.2-3
-	grep-3.4-1
-	groff-1.22.3-1
+	gmp-6.2.1-1
+	graphite2-1.3.14-1
+	graphite2_devel-1.3.14-1
+	grep-3.6-2
+	groff-1.22.4-1
 	gutenprint8-5.3.1-1
 	gutenprint8_devel-5.3.1-1
 	gzip-1.10-1
-	haikuwebkit-1.7.0-1
-	haikuwebkit_devel-1.7.0-1
-	icu-57.2-2
-	icu_devel-57.2-2
-	jam-2.5_2018_11_21-7
+	haikuwebkit-1.7.1-1
+	haikuwebkit_devel-1.7.1-1
+	harfbuzz-2.8.1-1
+	harfbuzz_devel-2.8.1-1
+	icu66-66.1-2
+	icu66_devel-66.1-2
+	jam-2.5_2018_11_21-8
 	jasper-2.0.16-4
 	jasper_devel-2.0.16-4
 	keymapswitcher-1.2.7.15-1
@@ -76,110 +91,123 @@ RemotePackageRepository HaikuPorts
 	lcms-2.9-6
 	lcms_devel-2.9-6
 	less-551-1
-	libbluray-1.1.2-1
-	libbluray_devel-1.1.2-1
-	libdvdnav-6.0.1-2
-	libdvdnav_devel-6.0.1-2
-	libdvdread-6.0.2-1
-	libdvdread_devel-6.0.2-1
-	libedit-20180525_3.1-2
-	libedit_devel-20180525_3.1-2
+	libass-0.15.0-2
+	libass_devel-0.15.0-2
+	libbluray-1.2.1-1
+	libbluray_devel-1.2.1-1
+	libdvdnav-6.0.1-3
+	libdvdnav_devel-6.0.1-3
+	libdvdread-6.1.1-1
+	libdvdread_devel-6.1.1-1
+	libedit-20210419_3.1-1
+	libedit_devel-20210419_3.1-1
 	libexecinfo-1.1-5
-	libffi-3.2.1-5
+	libffi-3.2.1-6
 	libgcrypt-1.8.5-1
 	libgpg_error-1.36-1
 	libiconv-1.16-1
 	libicns-0.8.1-8
 	libicns_devel-0.8.1-8
-	libidn2-2.0.5-1
-	libjpeg_turbo-2.0.3-3
-	libjpeg_turbo_devel-2.0.3-3
+	libidn2-2.0.5-2
+	libjpeg_turbo-2.0.6-1
+	libjpeg_turbo_devel-2.0.6-1
 	libmodplug-0.8.9.0-1
 	libogg-1.3.4-1
 	libogg_devel-1.3.4-1
-	libopenmpt-0.4.11-1
-	libopenmpt_devel-0.4.11-1
+	libopenmpt-0.5.5-1
+	libopenmpt_devel-0.5.5-1
 	libpcap-1.8.1-4
 	libpcap_devel-1.8.1-4
+	libpcre2-10.36-1
 	libpcre-8.44-1
-	libpcre2-10.34-2
+	libpcre_devel-8.44-1
 	libpng16-1.6.37-1
 	libpng16_devel-1.6.37-1
 	libpsl-0.21.0-1
 	libpsl_devel-0.21.0-1
 	libsolv-0.3.0_haiku_2014_12_22-3
 	libsolv_devel-0.3.0_haiku_2014_12_22-3
-	libtasn1-4.15.0-1
+	libtasn1-4.16.0-1
 	libtheora-1.1.1-7
 	libtheora_devel-1.1.1-7
 	libtool-2.4.6-2
 	libunistring-0.9.10-1
-	libvorbis-1.3.6-1
-	libvorbis_devel-1.3.6-1
-	libvpx-1.7.0-3
-	libvpx_devel-1.7.0-3
+	libvorbis-1.3.7-1
+	libvorbis_devel-1.3.7-1
+	libvpx-1.8.2-1
+	libvpx_devel-1.8.2-1
 	libuuid-1.3.1-4
 	libwebp-1.1.0-2
 	libwebp_devel-1.1.0-2
-	libxml2-2.9.10-1
-	libxml2_devel-2.9.10-1
-	libxslt-1.1.34-1
+	libxml2-2.9.10-4
+	libxml2_devel-2.9.10-4
+	libxslt-1.1.34-3
 	live555-2016.06.22-5
 	live555_devel-2016.06.22-5
 	llvm7-7.0.1-2
 	llvm7_libs-7.0.1-2
 	m4-1.4.18-3
-	make-4.1-3
+	make-4.1-4
 	mandoc-1.14.3-2
+	mawk-1.3.4_20171017-1
 	mercurial-4.8.1-2
 	mesa-17.1.10-6
 	mesa_devel-17.1.10-6
 	mesa_swpipe-17.1.10-6
 	mkdepend-1.7-5
-	mpc-1.1.0-2
-	mpfr-3.1.6-4
-	nano-4.9.2-1
+	mpc-1.2.1-1
+	mpfr-4.1.0-1
+	nano-5.7-1
 	nasm-2.14.02-2
 	ncurses6-6.2-1
 	ncurses6_devel-6.2-1
 	netcat-1.10-4
-	nettle-3.5.1-1
-	nghttp2-1.40.0-1
-	nghttp2_devel-1.40.0-1
+	nettle-3.7-1
+	nghttp2-1.43.0-1
+	nghttp2_devel-1.43.0-1
 	openexr-2.4.1-1
 	openexr_devel-2.4.1-1
-	openjpeg-2.3.1-2
-	openjpeg_devel-2.3.1-2
-	openssh-8.3p1-1
-	openssl-1.1.1g-2
-	openssl_devel-1.1.1g-2
-	p7zip-16.02-1
+	openjpeg-2.4.0-1
+	openjpeg_devel-2.4.0-1
+	openssh-8.4p1-2
+	openssl-1.1.1k-1
+	openssl_devel-1.1.1k-1
+	opus-1.3.1-1
+	opus_devel-1.3.1-1
+	p7zip-17.04-2
 	patch-2.7.6-2
 	pdflib-5.0.3-3
 	pdfwriter-1.0-3
 	pe-2.4.5-8
-	perl-5.30.2-1
+	perl-5.32.1-1
 	pkgconfig-0.29.2-4
-	python-2.7.17-2
+	python3-3.7.10-1
 	qrencode_kdl_devel-3.4.4-2
-	readline-8.0.4-1
-	sed-4.4-3
+	readline-8.1-1
+	sed-4.8-1
 	sharutils-4.15.2-3
+	snappy-1.1.8-1
+	snappy_devel-1.1.8-1
+	soxr-0.1.3-1
+	soxr_devel-0.1.3-1
 	speex-1.2.0-4
 	speex_devel-1.2.0-4
-	sqlite-3.31.1.0-1
-	subversion-1.9.7-2
-	subversion_devel-1.9.7-2
-	taglib-1.11.1-4
-	taglib_devel-1.11.1-4
-	tar-1.32-1
+	sqlite-3.34.1.0-1
+	subversion-1.14.1-1
+	subversion_devel-1.14.1-1
+	taglib-1.12-1
+	taglib_devel-1.12-1
+	tar-1.34-1
 	tcpdump-4.9.2-1
-	texinfo-6.7-1
-	tiff4-4.1.0-3
-	tiff4_devel-4.1.0-3
+	texinfo-6.7-2
+	tiff4-4.2.0-1
+	tiff4_devel-4.2.0-1
+	tnftp-20151004-6
 	unzip-6.10c23-4
 	vision-0.10.4-1
-	wget-1.20.3-3
+	wavpack-5.4.0-1
+	wavpack_devel-5.4.0-1
+	wget-1.21.1-1
 	which-2.21-6
 	wpa_supplicant-2.9.haiku.1-2
 	xz_utils-5.2.5-1
@@ -204,31 +232,39 @@ RemotePackageRepository HaikuPorts
 	coreutils
 	ctags
 	curl
+	dav1d
 	diffutils
+	enca
 	expat
+	fdk_aac
 	ffmpeg
+	file
 	findutils
 	flex
 	fluidlite
 	fontconfig
 	freetype
-	gawk
+	fribidi
+	game_music_emu
 	gcc
 	giflib
 	git
 	glu
 	gmp
+	graphite2
 	grep
 	gutenprint8
 	gzip
 	haikuporter
-	icu
+	hqrfbuzz
+	icu66
 	jam
 	jasper
 	keymapswitcher
 	lame
 	lcms
 	less
+	libass
 	libbluray
 	libdvdnav
 	libdvdread
@@ -264,6 +300,7 @@ RemotePackageRepository HaikuPorts
 	m4
 	make
 	mandoc
+	mawk
 	mercurial
 	mesa
 	mkdepend
@@ -279,6 +316,7 @@ RemotePackageRepository HaikuPorts
 	openjpeg
 	openssh
 	openssl
+	opus
 	p7zip
 	patch
 	pdflib
@@ -286,10 +324,12 @@ RemotePackageRepository HaikuPorts
 	pe
 	perl
 	pkgconfig
-	python
+	python3
 	readline
 	sed
 	sharutils
+	snappy
+	soxr
 	speex
 	sqlite
 	subversion
@@ -300,6 +340,7 @@ RemotePackageRepository HaikuPorts
 	tiff4
 	unzip
 	vision
+	wavpack
 	wget
 	which
 	wpa_supplicant
@@ -315,7 +356,6 @@ RemotePackageRepository HaikuPorts
 	diffutils
 	findutils
 	freetype
-	gawk
 	glu
 	grep
 	jpeg
diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2 b/build/jam/repositories/HaikuPorts/x86_gcc2
index 6dc27c1566..1695f2d83f 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -4,10 +4,10 @@ RemotePackageRepository HaikuPorts
 	:
 	# architecture "any" packages
 	be_book-2008_10_26-3
-	ca_root_certificates-2020_01_01-1
+	ca_root_certificates-2021_01_19-1
 	gnu_efi_kernel-3.0.10-1
 	haikuporter-1.2.3-2
-	noto-20170920-4
+	noto-20200106-1
 	noto_sans_cjk_jp-1.004-2
 	timgmsoundfont-fixed-5
 	wqy_microhei-0.2.0~beta-4
@@ -15,8 +15,8 @@ RemotePackageRepository HaikuPorts
 	# repository architecture packages
 	# primary architecture (x86_gcc2)
 	autoconf-2.69-8
-	automake-1.16.2-1
-	bash-5.0.017-1
+	automake-1.16.3-1
+	bash-5.1-1
 	bc-1.07.1-2
 	bepdf-2.1.2-1
 	binutils-2.17_2016_07_24-4
@@ -27,43 +27,40 @@ RemotePackageRepository HaikuPorts
 	cdrtools_devel-3.02~a09-1
 	ctags-5.8-5
 	coreutils-8.24-2
-	curl-7.70.0-2
-	curl_devel-7.70.0-2
+	curl-7.74.0-1
+	curl_devel-7.74.0-1
 	diffutils-3.7-1
-	expat-2.2.9-1
-	expat_devel-2.2.9-1
+	expat-2.2.10-1
+	expat_devel-2.2.10-1
+	ffmpeg-4.2.2-9
+	ffmpeg_devel-4.2.2-9
+	file-5.39-2
+	file_data-5.39-2
 	findutils-4.6.0-1
-	ffmpeg-4.2.2-3
-	ffmpeg_devel-4.2.2-3
-	flex-2.6.4-1
+	flex-2.6.4-2
 	fluidlite_devel-1.0.0-3
 	fontconfig-2.13.92-1
 	fontconfig_devel-2.13.92-1
-	freetype-2.9.1-2
-	freetype_devel-2.9.1-2
-	gawk-4.1.4-2
+	freetype-2.10.4-3
+	freetype_devel-2.10.4-3
 	gettext_libintl-0.19.8.1-7
 	gcc-2.95.3_2017_07_20-2
 	gcc_syslibs_devel-2.95.3_2017_07_20-2
-	giflib6-5.0.5-5
 	giflib-5.1.4-2
 	giflib_devel-5.1.4-2
-	git-2.26.0-2
-	git_arch-2.26.0-2
-	git_cvs-2.26.0-2
-	git_daemon-2.26.0-2
-	git_email-2.26.0-2
-	git_svn-2.26.0-2
+	git-2.30.2-2
+	git_arch-2.30.2-2
+	git_daemon-2.30.2-2
+	git_email-2.30.2-2
 	glu-9.0.0-7
 	glu_devel-9.0.0-7
-	grep-2.24-1
 	groff-1.20.1-4
 	gutenprint8-5.3.1-1
 	gutenprint8_devel-5.3.1-1
 	gzip-1.10-1
-	icu-57.2-2
-	icu_devel-57.2-2
-	jam-2.5_2018_11_21-7
+	icu-57.2-3
+	icu_devel-57.2-3
+	jam-2.5_2018_11_21-8
 	jasper-2.0.16-4
 	jasper_devel-2.0.16-4
 	keymapswitcher-1.2.7.15-1
@@ -72,20 +69,20 @@ RemotePackageRepository HaikuPorts
 	less-551-1
 	libedit-20180525_3.1-2
 	libedit_devel-20180525_3.1-2
-	libffi-3.0.13-2
+	libffi-3.0.13-3
 	libiconv-1.16-1
 	libicns-0.8.1-8
 	libicns_devel-0.8.1-8
-	libjpeg_turbo-2.0.3-3
-	libjpeg_turbo_devel-2.0.3-3
+	libjpeg_turbo-2.0.6-1
+	libjpeg_turbo_devel-2.0.6-1
 	liblayout-1.4.1-8
 	libmodplug-0.8.9.0-1
 	libogg-1.3.4-1
 	libogg_devel-1.3.4-1
-	libpcap-1.8.1-3
-	libpcap_devel-1.8.1-3
+	libpcap-1.8.1-4
+	libpcap_devel-1.8.1-4
 	libpcre-8.44-1
-	libpcre2-10.34-2
+	libpcre2-10.36-1
 	libpng16-1.6.37-1
 	libpng16_devel-1.6.37-1
 	libpsl-0.21.0-1
@@ -96,175 +93,199 @@ RemotePackageRepository HaikuPorts
 	libtheora_devel-1.1.1-7
 	libtool-2.4.6-2
 	libuuid-1.3.1-4
-	libvorbis-1.3.6-1
-	libvorbis_devel-1.3.6-1
+	libvorbis-1.3.7-1
+	libvorbis_devel-1.3.7-1
 	libvpx-1.0.0-2
 	libwebp-1.1.0-2
 	libwebp_devel-1.1.0-2
-	libxml2-2.9.10-1
-	libxml2_devel-2.9.10-1
+	libxml2-2.9.10-4
+	libxml2_devel-2.9.10-4
 	live555-2016.06.22-5
 	live555_devel-2016.06.22-5
 	m4-1.4.18-3
-	make-4.1-3
+	make-4.1-4
 	mandoc-1.14.3-2
-	mercurial-4.8.1-2
 	mesa-7.9.2-11
 	mesa_devel-7.9.2-11
 	mesa_swrast-7.9.2-11
 	mkdepend-1.7-5
-	nano-2.9.8-3
-	nasm-2.12.02-1
 	ncurses6-6.2-1
 	ncurses6_devel-6.2-1
 	netcat-1.10-4
-	nghttp2-1.40.0-1
-	nghttp2_devel-1.40.0-1
+	nghttp2-1.43.0-1
 	openexr-2.2.1-3
 	openexr_devel-2.2.1-3
 	openjpeg-2.1.2-3
 	openjpeg_devel-2.1.2-3
-	openssh-8.3p1-1
-	openssl-1.1.1g-2
-	openssl_devel-1.1.1g-2
-	p7zip-16.02-1
+	openssh-8.4p1-1
+	openssl-1.1.1k-1
+	openssl_devel-1.1.1k-1
+	opus-1.3.1-1
+	opus_devel-1.3.1-1
 	patch-2.7.5-3
 	pdflib-5.0.3-3
 	pdfwriter-1.0-3
 	pe-2.4.5-8
-	perl-5.30.2-1
+	perl-5.32.1-1
 	pkgconfig-0.29.2-4
-	python-2.7.17-2
 	qrencode_kdl_devel-3.4.4-2
-	readline-8.0.4-1
+	readline-8.1-1
 	sed-4.2.1-6
 	sharutils-4.15.2-3
 	speex-1.2.0-4
 	speex_devel-1.2.0-4
-	sqlite-3.31.1.0-1
-	subversion-1.9.7-1
-	subversion_devel-1.9.7-1
+	sqlite-3.34.1.0-1
 	taglib-1.7.2-3
 	taglib_devel-1.7.2-3
-	tar-1.32-1
 	tcpdump-4.9.2-1
-	texinfo-6.1-5
-	tiff4-4.1.0-3
-	tiff4_devel-4.1.0-3
+	texinfo-6.1-6
+	tiff4-4.2.0-1
+	tiff4_devel-4.2.0-1
+	tnftp-20151004-6
 	unzip-6.10c23-4
 	vision-0.10.4-1
-	wget-1.20.3-3
+	wget-1.21.1-1
 	which-2.21-6
-	wonderbrush-2.1.2-9
+	wonderbrush-2.1.2-11
 	wpa_supplicant-2.9.haiku.1-2
 	zip-3.0-4
 	zlib-1.2.11-4
 	zlib_devel-1.2.11-4
 	# secondary architecture (x86)
 	binutils_x86-2.26.1_2016_07_22-6
-	bison_x86-3.5.4-1
+	bison_x86-3.7.6-1
 	bzip2_x86-1.0.8-1
 	bzip2_x86_devel-1.0.8-1
 	cdrtools_x86-3.02~a09-1
 	cdrtools_x86_devel-3.02~a09-1
-	curl_x86-7.70.0-2
-	curl_x86_devel-7.70.0-2
-	expat_x86-2.2.9-1
-	expat_x86_devel-2.2.9-1
-	ffmpeg_x86-4.2.2-3
-	ffmpeg_x86_devel-4.2.2-3
+	curl_x86-7.74.0-1
+	curl_x86_devel-7.74.0-1
+	dav1d_x86-0.8.2-1
+	dav1d_x86_devel-0.8.2-1
+	enca_x86-1.19-2
+	enca_x86_devel-1.19-2
+	expat_x86-2.2.10-1
+	expat_x86_devel-2.2.10-1
+	fdk_aac_x86-2.0.1-1
+	ffmpeg_x86-4.2.2-9
+	ffmpeg_x86_devel-4.2.2-9
 	fluidlite_x86_devel-1.0.0-3
 	fontconfig_x86-2.13.92-1
 	fontconfig_x86_devel-2.13.92-1
-	freetype_x86-2.9.1-2
-	freetype_x86_devel-2.9.1-2
-	gcc_x86-8.3.0_2019_05_24-7
-	gcc_x86_syslibs-8.3.0_2019_05_24-7
-	gcc_x86_syslibs_devel-8.3.0_2019_05_24-7
+	freetype_x86-2.10.4-3
+	freetype_x86_devel-2.10.4-3
+	fribidi_x86-1.0.10-1
+	fribidi_x86_devel-1.0.10-1
+	game_music_emu_x86-0.6.3-1
+	game_music_emu_x86_devel-0.6.3-1
+	gcc_x86-8.3.0_2019_05_24-9
+	gcc_x86_syslibs-8.3.0_2019_05_24-9
+	gcc_x86_syslibs_devel-8.3.0_2019_05_24-9
+	gettext_x86-0.19.8.1-7
 	gettext_x86_libintl-0.19.8.1-7
-	giflib6_x86-5.0.5-5
 	giflib_x86-5.2.1-1
 	giflib_x86_devel-5.2.1-1
 	glu_x86-9.0.0-7
 	glu_x86_devel-9.0.0-7
-	gmp_x86-6.1.2-3
-	haikuwebkit_x86-1.7.0-1
-	haikuwebkit_x86_devel-1.7.0-1
-	icu_x86-57.2-2
-	icu_x86_devel-57.2-2
-	icu66_x86-66.1-1
-	icu66_x86_devel-66.1-1
+	gmp_x86-6.2.1-1
+	graphite2_x86-1.3.14-1
+	graphite2_x86_devel-1.3.14-1
+	grep_x86-3.6-2
+	haikuwebkit_x86-1.7.1-1
+	haikuwebkit_x86_devel-1.7.1-1
+	harfbuzz_x86-2.7.4-3
+	harfbuzz_x86_devel-2.7.4-3
+	icu66_x86-66.1-2
+	icu66_x86_devel-66.1-2
 	jasper_x86-2.0.16-4
 	jasper_x86_devel-2.0.16-4
 	lame_x86-3.100-3
 	lame_x86_devel-3.100-3
 	lcms_x86-2.9-6
 	lcms_x86_devel-2.9-6
+	libass_x86-0.15.0-2
+	libass_x86_devel-0.15.0-2
 	libedit_x86-20180525_3.1-2
 	libedit_x86_devel-20180525_3.1-2
 	libexecinfo_x86-1.1-5
+	libffi_x86-3.2.1-6
+	libffi_x86_devel-3.2.1-6
 	libgcrypt_x86-1.8.5-1
 	libgpg_error_x86-1.36-1
 	libiconv_x86-1.16-1
+	libiconv_x86_devel-1.16-1
 	libicns_x86-0.8.1-8
 	libicns_x86_devel-0.8.1-8
-	libidn2_x86-2.0.5-1
-	libjpeg_turbo_x86-2.0.3-3
-	libjpeg_turbo_x86_devel-2.0.3-3
+	libidn2_x86-2.0.5-2
+	libjpeg_turbo_x86-2.0.6-1
+	libjpeg_turbo_x86_devel-2.0.6-1
 	libmodplug_x86-0.8.9.0-1
 	libogg_x86-1.3.4-1
 	libogg_x86_devel-1.3.4-1
-	libopenmpt_x86-0.4.11-1
-	libopenmpt_x86_devel-0.4.11-1
+	libopenmpt_x86-0.5.5-1
+	libopenmpt_x86_devel-0.5.5-1
+	libpcre_x86-8.44-1
+	libpcre_x86_devel-8.44-1
 	libpng16_x86-1.6.37-1
 	libpng16_x86_devel-1.6.37-1
 	libsolv_x86-0.3.0_haiku_2014_12_22-3
 	libsolv_x86_devel-0.3.0_haiku_2014_12_22-3
-	libtasn1_x86-4.15.0-1
+	libtasn1_x86-4.16.0-1
 	libtheora_x86-1.1.1-7
 	libtheora_x86_devel-1.1.1-7
 	libtool_x86-2.4.6-2
 	libtool_x86_libltdl-2.4.6-2
 	libunistring_x86-0.9.10-1
-	libvorbis_x86-1.3.6-1
-	libvorbis_x86_devel-1.3.6-1
-	libvpx_x86-1.7.0-3
-	libvpx_x86_devel-1.7.0-3
+	libvorbis_x86-1.3.7-1
+	libvorbis_x86_devel-1.3.7-1
+	libvpx_x86-1.8.2-1
+	libvpx_x86_devel-1.8.2-1
 	libwebp_x86-1.1.0-2
 	libwebp_x86_devel-1.1.0-2
-	libxml2_x86-2.9.10-1
-	libxml2_x86_devel-2.9.10-1
-	libxslt_x86-1.1.34-1
+	libxml2_x86-2.9.10-4
+	libxml2_x86_devel-2.9.10-4
+	libxslt_x86-1.1.34-3
 	live555_x86-2016.06.22-5
 	live555_x86_devel-2016.06.22-5
-	llvm_x86-5.0.0-3
-	llvm_x86_libs-5.0.0-3
 	llvm7_x86_libs-7.0.1-2
 	mesa_x86-17.1.10-6
 	mesa_x86_devel-17.1.10-6
 	mesa_x86_swpipe-17.1.10-6
+	nano_x86-5.5-1
+	nasm_x86-2.14.02-2
 	ncurses6_x86-6.2-1
 	ncurses6_x86_devel-6.2-1
-	mpc_x86-1.1.0-2
-	mpfr_x86-3.1.6-4
-	nettle_x86-3.5.1-1
-	nghttp2_x86-1.40.0-1
-	nghttp2_x86_devel-1.40.0-1
+	mawk-1.3.4_20171017-1
+	mpc_x86-1.2.1-1
+	mpfr_x86-4.1.0-1
+	nettle_x86-3.7-1
 	openexr_x86-2.4.1-1
 	openexr_x86_devel-2.4.1-1
-	openjpeg_x86-2.3.1-2
-	openjpeg_x86_devel-2.3.1-2
-	openssl_x86-1.1.1g-2
-	openssl_x86_devel-1.1.1g-2
+	openjpeg_x86-2.4.0-1
+	openjpeg_x86_devel-2.4.0-1
+	openssl_x86-1.1.1k-1
+	openssl_x86_devel-1.1.1k-1
+	opus_x86-1.3.1-1
+	opus_x86_devel-1.3.1-1
+	p7zip_x86-17.04-2
 	pkgconfig_x86-0.29.2-4
+	python3_x86-3.7.10-1
+	readline_x86-8.1-1
 	sharutils_x86-4.15.2-3
+	snappy_x86-1.1.8-1
+	snappy_x86_devel-1.1.8-1
+	soxr_x86-0.1.3-1
+	soxr_x86_devel-0.1.3-1
 	speex_x86-1.2.0-4
 	speex_x86_devel-1.2.0-4
-	sqlite_x86-3.31.1.0-1
-	taglib_x86-1.11.1-4
-	taglib_x86_devel-1.11.1-4
-	tiff4_x86-4.1.0-3
-	tiff4_x86_devel-4.1.0-3
+	sqlite_x86-3.34.1.0-1
+	taglib_x86-1.12-1
+	taglib_x86_devel-1.12-1
+	tar_x86-1.34-1
+	tiff4_x86-4.2.0-1
+	tiff4_x86_devel-4.2.0-1
+	wavpack_x86-5.4.0-1
+	wavpack_x86_devel-5.4.0-1
 	xz_utils_x86-5.2.5-1
 	xz_utils_x86_devel-5.2.5-1
 	zlib_x86-1.2.11-4
@@ -286,39 +307,47 @@ RemotePackageRepository HaikuPorts
 	coreutils
 	ctags
 	curl
+	dav1d_x86
 	diffutils
+	enca_x86
 	expat
-	findutils
+	fdk_aac_x86
 	ffmpeg
 	ffmpeg_x86
+	file
+	findutils
 	flex
 	fluidlite
 	fontconfig
 	freetype
-	gawk
+	fribidi_x86
+	game_music_emu_x86
 	gcc
 	gcc_x86
-	giflib6
 	giflib
 	git
 	glu
 	gmp
-	grep
+	graphite2_x86
+	grep_x86
 	gutenprint8
 	gzip
 	haikuporter
 	haikuwebkit_x86
+	harfbuzz_x86
 	icu
-	icu66
+	icu66_x86
 	jam
 	jasper
 	keymapswitcher
 	lcms_x86
 	less
+	libass_x86
 	libedit
 	libedit_x86
 	libexecinfo
 	libffi
+	libffi_x86
 	libgcrypt
 	libgpg_error
 	libiconv
@@ -333,37 +362,32 @@ RemotePackageRepository HaikuPorts
 	libpcre
 	libpcre2
 	libpng16
-	libpng16_x86
 	libpsl
 	libsolv
 	libtasn1
 	libtheora
-	libtheora_x86
 	libtool
-	libtool_x86
 	libunistring
 	libuuid
 	libvorbis
-	libvorbis_x86
 	libvpx
 	libvpx_x86
 	libwebp
 	libxml2
 	libxslt
 	live555
-	llvm_x86
+	llvm7_x86
 	m4
 	make
 	mandoc
-	mercurial
+	mawk
 	mesa
 	mesa_x86
 	mkdepend
 	mpc
 	mpfr
-	nghttp2
-	nano
-	nasm
+	nano_x86
+	nasm_x86
 	ncurses6
 	netcat
 	nettle
@@ -372,29 +396,31 @@ RemotePackageRepository HaikuPorts
 	openjpeg
 	openssh
 	openssl
-	p7zip
+	opus
+	p7zip_x86
 	patch
 	pdflib
 	pdfwriter
 	pe
 	perl
 	pkgconfig
-	pkgconfig_x86
-	python
+	python_x86
 	readline
 	sed
 	sharutils
+	snappy_x86
+	soxr_x86
 	speex
 	sqlite
-	subversion
 	taglib
 	taglib_x86
-	tar
+	tar_x86
 	tcpdump
 	texinfo
 	tiff4
 	unzip
 	vision
+	wavpack_x86
 	wget
 	which
 	wpa_supplicant
@@ -409,11 +435,10 @@ RemotePackageRepository HaikuPorts
 	ctags
 	diffutils
 	findutils
-	gawk
 	glu
 	grep
 	m4
 	sed
-	tar
+	tar_x86
 	which
 	;
diff --git a/src/apps/devices/Jamfile b/src/apps/devices/Jamfile
index bf09be9cc7..c1ec72a605 100644
--- a/src/apps/devices/Jamfile
+++ b/src/apps/devices/Jamfile
@@ -20,7 +20,7 @@ rule ISAPnPHeaderGen
 actions ISAPnPHeaderGen1
 {
 	grep '^PNP[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]] '  $(2[1]) \
-| gawk -f $(2[2]) > $(1) ;
+| awk -f $(2[2]) > $(1) ;
 }
 
 ISAPnPHeaderGen [ FGristFiles isapnpids.h ] : isapnp_devids.txt : devlist2h.awk ;
@@ -37,7 +37,7 @@ rule PCIHeaderGen
 
 actions PCIHeaderGen1
 {
-	gawk -v HEADERFILE=$(1) -f $(2[2]) $(2[1])
+	awk -v HEADERFILE=$(1) -f $(2[2]) $(2[1])
 }
 
 local pciidsFile = pci.ids ;
@@ -57,7 +57,7 @@ rule USBHeaderGen
 
 actions USBHeaderGen1
 {
-	gawk -v HEADERFILE=$(1) -f $(2[2]) $(2[1])
+	awk -v HEADERFILE=$(1) -f $(2[2]) $(2[1])
 }
 
 local usbidsFile = usb.ids ;
diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
index e9fdb7b599..3649d60dc2 100644
--- a/src/data/package_infos/x86/haiku
+++ b/src/data/package_infos/x86/haiku
@@ -55,7 +55,6 @@ requires {
 	cmd:tar
 	cmd:unzip
 #endif
-	lib:libcurl
 #ifdef HAIKU_BUILD_FEATURE_X86_LIBEDIT_ENABLED
 	lib:libedit
 #endif
diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku
index 03c97e9ece..15a3babfe8 100644
--- a/src/data/package_infos/x86_64/haiku
+++ b/src/data/package_infos/x86_64/haiku
@@ -9,7 +9,7 @@ boot loader, kernel, the system libraries, servers, and applications."
 packager		"The Haiku build system"
 vendor			"Haiku Project"
 
-copyrights		"2001-2020 Haiku, Inc. et al"
+copyrights		"2001-2021 Haiku, Inc. et al"
 licenses {
 	MIT
 	"GNU LGPL v2.1"
@@ -55,7 +55,6 @@ requires {
 	cmd:tar
 	cmd:unzip
 #endif
-	lib:libcurl
 #ifdef HAIKU_BUILD_FEATURE_X86_64_LIBEDIT_ENABLED
 	lib:libedit
 #endif
@@ -64,12 +63,12 @@ requires {
 #endif
 	lib:libfreetype
 	lib:libgcc_s
-	lib:libicudata >= 57
-	lib:libicui18n >= 57
-	lib:libicuio >= 57
-	lib:libicutest >= 57
-	lib:libicutu >= 57
-	lib:libicuuc >= 57
+	lib:libicudata >= 66
+	lib:libicui18n >= 66
+	lib:libicuio >= 66
+	lib:libicutest >= 66
+	lib:libicutu >= 66
+	lib:libicuuc >= 66
 	lib:libncurses >= 6.0
 #ifdef HAIKU_REGULAR_BUILD
 #ifdef HAIKU_BUILD_FEATURE_X86_64_EXPAT_ENABLED
@@ -91,7 +90,7 @@ requires {
 	lib:libpng16
 #endif
 #ifdef HAIKU_BUILD_FEATURE_X86_64_TIFF_ENABLED
-	lib:libtiff >= 5.2
+	lib:libtiff >= 5.6
 #endif
 #ifdef HAIKU_BUILD_FEATURE_X86_64_LIBWEBP_ENABLED
 	lib:libwebp
diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku
index 92a738beb8..22a6144c6d 100644
--- a/src/data/package_infos/x86_gcc2/haiku
+++ b/src/data/package_infos/x86_gcc2/haiku
@@ -9,7 +9,7 @@ boot loader, kernel, the system libraries, servers, and applications."
 packager		"The Haiku build system"
 vendor			"Haiku Project"
 
-copyrights		"2001-2020 Haiku, Inc. et al"
+copyrights		"2001-2021 Haiku, Inc. et al"
 licenses {
 	MIT
 	"GNU LGPL v2.1"
@@ -56,7 +56,6 @@ requires {
 	cmd:tar
 	cmd:unzip
 #endif
-	lib:libcurl
 #ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBEDIT_ENABLED
 	lib:libedit
 #endif
@@ -91,7 +90,7 @@ requires {
 	lib:libpng16
 #endif
 #ifdef HAIKU_BUILD_FEATURE_X86_GCC2_TIFF_ENABLED
-	lib:libtiff >= 5.2
+	lib:libtiff >= 5.6
 #endif
 #ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBWEBP_ENABLED
 	lib:libwebp
diff --git a/src/data/package_infos/x86_gcc2/haiku_secondary b/src/data/package_infos/x86_gcc2/haiku_secondary
index 4dcd8bfe41..e2209571fe 100644
--- a/src/data/package_infos/x86_gcc2/haiku_secondary
+++ b/src/data/package_infos/x86_gcc2/haiku_secondary
@@ -10,7 +10,7 @@ other files required to run programs build for that architecture."
 packager		"The Haiku build system"
 vendor			"Haiku Project"
 
-copyrights		"2001-2020 Haiku, Inc. et al"
+copyrights		"2001-2021 Haiku, Inc. et al"
 licenses {
 	MIT
 	"GNU LGPL v2.1"
@@ -24,18 +24,18 @@ provides {
 requires {
 	lib:libfreetype_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libgcc_s_%HAIKU_SECONDARY_PACKAGING_ARCH%
-	lib:libicudata_%HAIKU_SECONDARY_PACKAGING_ARCH%
-	lib:libicui18n_%HAIKU_SECONDARY_PACKAGING_ARCH%
-	lib:libicuio_%HAIKU_SECONDARY_PACKAGING_ARCH%
-	lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH%
-	lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH%
-	lib:libicuuc_%HAIKU_SECONDARY_PACKAGING_ARCH%
+	lib:libicudata_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 66
+	lib:libicui18n_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 66
+	lib:libicuio_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 66
+	lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 66
+	lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 66
+	lib:libicuuc_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 66
 #ifdef HAIKU_REGULAR_BUILD
 	lib:libicns_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libpng16_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0
-	lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.2
+	lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.6
 	lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH%
 
 	lib:libilmimf_2_4_%HAIKU_SECONDARY_PACKAGING_ARCH%
diff --git a/src/libs/compat/freebsd_network/Jamfile b/src/libs/compat/freebsd_network/Jamfile
index 88544372fb..eb0acf8c66 100644
--- a/src/libs/compat/freebsd_network/Jamfile
+++ b/src/libs/compat/freebsd_network/Jamfile
@@ -65,17 +65,17 @@ rule MIIHeaderGen
 
 actions MIIHeaderGen1
 {
-	gawk -v HEADERFILE=$(1) -f $(2[2]) $(2[1])
+	awk -v HEADERFILE=$(1) -f $(2[2]) $(2[1])
 }
 
 MIIHeaderGen [ FGristFiles miidevs.h ] : miidevs : miidevs2h.awk ;
 
 rule USBDevsHeaderGen
 {
-    SEARCH on $(2) = [ FDirName $(SUBDIR) compat dev usb ] ;
+	SEARCH on $(2) = [ FDirName $(SUBDIR) compat dev usb ] ;
 	SEARCH on $(3) = [ FDirName $(SUBDIR) tools ] ;
 
-    Depends $(1) : $(2) $(3) ;
+	Depends $(1) : $(2) $(3) ;
 	MakeLocateArch $(<) ;
 	USBDevsHeaderGen1 $(1) : $(2) $(3) ;
 	LocalClean clean : $(<) ;
@@ -83,7 +83,7 @@ rule USBDevsHeaderGen
 
 actions USBDevsHeaderGen1
 {
-    gawk -v HEADERFILE=$(1[1]) -v DATAFILE=$(1[2]) -f $(2[2]) $(2[1])
+	awk -v HEADERFILE=$(1[1]) -v DATAFILE=$(1[2]) -f $(2[2]) $(2[1])
 }
 
 USBDevsHeaderGen [ FGristFiles usbdevs.h usbdevs_data.h ] : usbdevs