diff --git a/media-libs/harfbuzz/harfbuzz-4.0.0.recipe b/media-libs/harfbuzz/harfbuzz-4.0.0.recipe
index d32986984..99df2f4c6 100644
--- a/media-libs/harfbuzz/harfbuzz-4.0.0.recipe
+++ b/media-libs/harfbuzz/harfbuzz-4.0.0.recipe
@@ -16,7 +16,7 @@ COPYRIGHT="2004-2018 Behdad Esfahbod
 	2004,2007,2008,2009,2010 Red Hat, Inc.
 	1998-2004 David Turner and Werner Lemberg"
 LICENSE="MIT"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://github.com/harfbuzz/harfbuzz/releases/download/$portVersion/harfbuzz-$portVersion.tar.xz"
 CHECKSUM_SHA256="ab61d4e3fc0c30072e98b46aa7727fc3eed36a85d2b6b9274cec7eaadea97cb7"
 PATCHES="harfbuzz-$portVersion.patchset"
@@ -37,14 +37,29 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 PROVIDES="
 	harfbuzz$secondaryArchSuffix = $portVersion compat >= 0.9
 	lib:libharfbuzz$secondaryArchSuffix = $libVersionCompat
-	lib:libharfbuzz_gobject$secondaryArchSuffix = $libVersionCompat
 	lib:libharfbuzz_icu$secondaryArchSuffix = $libVersionCompat
 	lib:libharfbuzz_subset$secondaryArchSuffix = $libVersionCompat
-	cmd:hb_ot_shape_closure$commandSuffix = $portVersion
-	cmd:hb_shape$commandSuffix = $portVersion
-	cmd:hb_subset$commandSuffix = $portVersion
 	"
 REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libgraphite2$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libicuuc$secondaryArchSuffix >= 66
+	lib:libintl$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+SUMMARY_glib="$SUMMARY (glib)"
+DESCRIPTION_glib="$DESCRIPTION (glib)"
+
+PROVIDES_glib="
+	harfbuzz${secondaryArchSuffix}_glib = $portVersion compat >= 0.9
+	lib:libharfbuzz_gobject$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_glib="
 	haiku$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
@@ -54,6 +69,7 @@ REQUIRES="
 	lib:libgmodule_2.0$secondaryArchSuffix
 	lib:libgobject_2.0$secondaryArchSuffix
 	lib:libgraphite2$secondaryArchSuffix
+	lib:libharfbuzz$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix >= 66
 	lib:libintl$secondaryArchSuffix
@@ -107,11 +123,7 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage harfbuzz$secondaryArchSuffix \
-	"$commandBinDir"/hb-ot-shape-closure \
-	"$commandBinDir"/hb-shape \
-	"$commandBinDir"/hb-subset \
 	"$libDir"/libharfbuzz.so.$libVersion \
-	"$libDir"/libharfbuzz-gobject.so.$libVersion \
 	"$libDir"/libharfbuzz-icu.so.$libVersion \
 	"$libDir"/libharfbuzz-subset.so.$libVersion
 
@@ -126,8 +138,9 @@ BUILD()
 		--infodir=$infoDir \
 		--datadir=$dataDir \
 		--bindir="$commandBinDir" \
-		-Dglib=enabled \
+		-Dglib=disabled \
 		-Dicu=enabled \
+		-Dintrospection=enabled \
 		-Dgraphite2=enabled \
 		-Dgobject=enabled \
 		-Ddocs=enabled \
@@ -156,6 +169,12 @@ INSTALL()
 
 	fixPkgconfig
 
+	# glib package
+	packageEntries glib \
+		"$dataDir" \
+		"$libDir"/girepository-1.0 \
+		"$libDir"/libharfbuzz-gobject.so*
+
 	# devel package
 	packageEntries devel \
 		"$docDir" \