diff --git a/media-libs/harfbuzz/harfbuzz-2.8.1.recipe b/media-libs/harfbuzz/harfbuzz-3.4.0.recipe
similarity index 95%
rename from media-libs/harfbuzz/harfbuzz-2.8.1.recipe
rename to media-libs/harfbuzz/harfbuzz-3.4.0.recipe
index 28ad823f6..cedf8e06c 100644
--- a/media-libs/harfbuzz/harfbuzz-2.8.1.recipe
+++ b/media-libs/harfbuzz/harfbuzz-3.4.0.recipe
@@ -18,7 +18,7 @@ COPYRIGHT="2004-2018 Behdad Esfahbod
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://github.com/harfbuzz/harfbuzz/releases/download/$portVersion/harfbuzz-$portVersion.tar.xz"
-CHECKSUM_SHA256="4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300"
+CHECKSUM_SHA256="7158a87c4db82521fc506711f0c8864115f0292d95f7136c8812c11811cdf952"
 PATCHES="harfbuzz-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -31,7 +31,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
-libVersion="0.20801.0"
+libVersion="0.30400.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
@@ -67,7 +67,7 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libbz2$secondaryArchSuffix
-	devel:libfreetype$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix >= 6.18.1
 	devel:libgraphite2$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libicuuc$secondaryArchSuffix >= 66
diff --git a/media-libs/harfbuzz/patches/harfbuzz-1.9.0.patchset b/media-libs/harfbuzz/patches/harfbuzz-1.9.0.patchset
deleted file mode 100644
index 7f03bf74e..000000000
--- a/media-libs/harfbuzz/patches/harfbuzz-1.9.0.patchset
+++ /dev/null
@@ -1,64 +0,0 @@
-From cd059ecb349a848e670418a347c5f7c51e041ba4 Mon Sep 17 00:00:00 2001
-From: fbrosson <fbrosson@localhost>
-Date: Wed, 6 Jun 2018 20:38:08 +0000
-Subject: Fix script in the test suite to better filter the output of nm.
-
-src/check-symbols.sh compares the list of symbols in libharfbuzz.so against
-a known list, $IGNORED_SYMBOLS, but Haiku has 2 symbols which are missing
-in this list: _gSharedObjectHaiku{ABI,Version}.
-
-diff --git a/src/check-symbols.sh b/src/check-symbols.sh
-index d4eca50..b181814 100755
---- a/src/check-symbols.sh
-+++ b/src/check-symbols.sh
-@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
- test -z "$libs" && libs=.libs
- stat=0
- 
--IGNORED_SYMBOLS='_fini\|_init\|_fdata\|_ftext\|_fbss\|__bss_start\|__bss_start__\|__bss_end__\|_edata\|_end\|_bss_end__\|__end__\|__gcov_flush\|llvm_.*'
-+IGNORED_SYMBOLS='_fini\|_init\|_fdata\|_ftext\|_fbss\|__bss_start\|__bss_start__\|__bss_end__\|_edata\|_end\|_bss_end__\|__end__\|__gcov_flush\|_gSharedObjectHaikuABI\|_gSharedObjectHaikuVersion\|llvm_.*'
- 
- if which nm 2>/dev/null >/dev/null; then
- 	:
--- 
-2.17.1
-
-
-From dd78e507d3f667f7aa2027fe719bb11735882e4f Mon Sep 17 00:00:00 2001
-From: fbrosson <fbrosson@localhost>
-Date: Wed, 6 Jun 2018 20:39:08 +0000
-Subject: Patch src/check-libstdc++.sh to use objdump instead of ldd.
-
-
-diff --git a/src/check-libstdc++.sh b/src/check-libstdc++.sh
-index ce0bdab..ccfb420 100755
---- a/src/check-libstdc++.sh
-+++ b/src/check-libstdc++.sh
-@@ -10,10 +10,15 @@ stat=0
- 
- if which ldd 2>/dev/null >/dev/null; then
- 	LDD=ldd
-+	GREP_NEEDED=cat
- else
- 	# macOS specific tool
- 	if which otool 2>/dev/null >/dev/null; then
- 		LDD="otool -L"
-+		GREP_NEEDED=cat
-+	elif which objdump 2>/dev/null >/dev/null; then
-+		LDD="objdump -x"
-+		GREP_NEEDED="grep NEEDED"
- 	else
- 		echo "check-libstdc++.sh: 'ldd' not found; skipping test"
- 		exit 77
-@@ -29,7 +34,7 @@ for soname in harfbuzz harfbuzz-gobject; do
- 		if ! test -f "$so"; then continue; fi
- 
- 		echo "Checking that we are not linking to libstdc++ or libc++ in $so"
--		if $LDD $so | grep 'libstdc[+][+]\|libc[+][+]'; then
-+		if $LDD $so | $GREP_NEEDED | grep 'libstdc[+][+]\|libc[+][+]'; then
- 			echo "Ouch, linked to libstdc++ or libc++"
- 			stat=1
- 		fi
--- 
-2.17.1
-
diff --git a/media-libs/harfbuzz/patches/harfbuzz-2.1.3.patchset b/media-libs/harfbuzz/patches/harfbuzz-2.1.3.patchset
deleted file mode 100644
index 682f844d6..000000000
--- a/media-libs/harfbuzz/patches/harfbuzz-2.1.3.patchset
+++ /dev/null
@@ -1,64 +0,0 @@
-From cd059ecb349a848e670418a347c5f7c51e041ba4 Mon Sep 17 00:00:00 2001
-From: fbrosson <fbrosson@localhost>
-Date: Wed, 6 Jun 2018 20:38:08 +0000
-Subject: Fix script in the test suite to better filter the output of nm.
-
-src/check-symbols.sh compares the list of symbols in libharfbuzz.so against
-a known list, $IGNORED_SYMBOLS, but Haiku has 2 symbols which are missing
-in this list: _gSharedObjectHaiku{ABI,Version}.
-
-diff --git a/src/check-symbols.sh b/src/check-symbols.sh
-index cea8684..538291e 100755
---- a/src/check-symbols.sh
-+++ b/src/check-symbols.sh
-@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
- test -z "$libs" && libs=.libs
- stat=0
- 
--IGNORED_SYMBOLS='_fini\|_init\|_fdata\|_ftext\|_fbss\|__bss_start\|__bss_start__\|__bss_end__\|_edata\|_end\|_bss_end__\|__end__\|__gcov_flush\|llvm_.*'
-+IGNORED_SYMBOLS='_fini\|_init\|_fdata\|_ftext\|_fbss\|__bss_start\|__bss_start__\|__bss_end__\|_edata\|_end\|_bss_end__\|__end__\|__gcov_flush\|_gSharedObjectHaikuABI\|_gSharedObjectHaikuVersion\|llvm_.*'
- 
- if which nm 2>/dev/null >/dev/null; then
- 	:
--- 
-2.17.1
-
-
-From dd78e507d3f667f7aa2027fe719bb11735882e4f Mon Sep 17 00:00:00 2001
-From: fbrosson <fbrosson@localhost>
-Date: Wed, 6 Jun 2018 20:39:08 +0000
-Subject: Patch src/check-libstdc++.sh to use objdump instead of ldd.
-
-
-diff --git a/src/check-libstdc++.sh b/src/check-libstdc++.sh
-index ce0bdab..ccfb420 100755
---- a/src/check-libstdc++.sh
-+++ b/src/check-libstdc++.sh
-@@ -10,10 +10,15 @@ stat=0
- 
- if which ldd 2>/dev/null >/dev/null; then
- 	LDD=ldd
-+	GREP_NEEDED=cat
- else
- 	# macOS specific tool
- 	if which otool 2>/dev/null >/dev/null; then
- 		LDD="otool -L"
-+		GREP_NEEDED=cat
-+	elif which objdump 2>/dev/null >/dev/null; then
-+		LDD="objdump -x"
-+		GREP_NEEDED="grep NEEDED"
- 	else
- 		echo "check-libstdc++.sh: 'ldd' not found; skipping test"
- 		exit 77
-@@ -29,7 +34,7 @@ for soname in harfbuzz harfbuzz-gobject; do
- 		if ! test -f "$so"; then continue; fi
- 
- 		echo "Checking that we are not linking to libstdc++ or libc++ in $so"
--		if $LDD $so | grep 'libstdc[+][+]\|libc[+][+]'; then
-+		if $LDD $so | $GREP_NEEDED | grep 'libstdc[+][+]\|libc[+][+]'; then
- 			echo "Ouch, linked to libstdc++ or libc++"
- 			stat=1
- 		fi
--- 
-2.17.1
-
diff --git a/media-libs/harfbuzz/patches/harfbuzz-2.8.1.patchset b/media-libs/harfbuzz/patches/harfbuzz-3.4.0.patchset
similarity index 63%
rename from media-libs/harfbuzz/patches/harfbuzz-2.8.1.patchset
rename to media-libs/harfbuzz/patches/harfbuzz-3.4.0.patchset
index b9e2bf197..ddb13ef97 100644
--- a/media-libs/harfbuzz/patches/harfbuzz-2.8.1.patchset
+++ b/media-libs/harfbuzz/patches/harfbuzz-3.4.0.patchset
@@ -1,16 +1,16 @@
-From 5d399a2b7b64d0cd143fe4a37e623de802086523 Mon Sep 17 00:00:00 2001
+From 449363d3cc3a4fee944742dc2309d14873ae2287 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 5 Jan 2021 15:32:02 +0100
 Subject: Patch testsuite scripts after Python migration
 
 
 diff --git a/src/check-libstdc++.py b/src/check-libstdc++.py
-index 200c683..5c1d7b9 100755
+index 85b7265..8e754ac 100755
 --- a/src/check-libstdc++.py
 +++ b/src/check-libstdc++.py
-@@ -14,8 +14,12 @@ else:
- 	if ldd:
- 		ldd = [ldd, '-L'] # otool -L
+@@ -12,8 +12,12 @@ if not ldd:
+ 	if otool:
+ 		ldd = otool + ' -L'
  	else:
 -		print ('check-libstdc++.py: \'ldd\' not found; skipping test')
 -		sys.exit (77)
@@ -24,19 +24,18 @@ index 200c683..5c1d7b9 100755
  stat = 0
  tested = False
 diff --git a/src/check-symbols.py b/src/check-symbols.py
-index c366dc0..3a730ba 100755
+index 385959b..d92c1ec 100755
 --- a/src/check-symbols.py
 +++ b/src/check-symbols.py
-@@ -9,7 +9,8 @@ libs = os.getenv ('libs', '.libs')
- 
+@@ -10,7 +10,7 @@ libs = os.getenv ('libs', '.libs')
  IGNORED_SYMBOLS = '|'.join(['_fini', '_init', '_fdata', '_ftext', '_fbss',
  	'__bss_start', '__bss_start__', '__bss_end__', '_edata', '_end', '_bss_end__',
--	'__end__', '__gcov_.*', 'llvm_.*', 'flush_fn_list', 'writeout_fn_list', 'mangle_path'])
-+	'__end__', '__gcov_.*', 'llvm_.*', 'flush_fn_list', 'writeout_fn_list', 'mangle_path',
-+	'_gSharedObjectHaikuABI', '_gSharedObjectHaikuVersion'])
+ 	'__end__', '__gcov_.*', 'llvm_.*', 'flush_fn_list', 'writeout_fn_list', 'mangle_path',
+-	'lprofDirMode', 'reset_fn_list'])
++	'lprofDirMode', 'reset_fn_list', '_gSharedObjectHaikuABI', '_gSharedObjectHaikuVersion'])
  
- nm = shutil.which ('nm')
+ nm = os.getenv ('NM', shutil.which ('nm'))
  if not nm:
 -- 
-2.30.0
+2.30.2