diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index b474d96aeba..dfb687cf3c6 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,11 +1,11 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.8.18
+version=1.8.20
 revision=1
 build_style=gnu-configure
+build_helper="gir"
 configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
-hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config
- $(vopt_if gir 'gobject-introspection')"
+hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
 makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
  libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
  polkit-devel mobile-broadband-provider-info"
@@ -16,15 +16,21 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=23dc1404f1e0622b7c4718b6d978b101d5e4d9be0b92133b3863a4dc29786178
+checksum=050dbb155566c715239dc0378844d8beed10954e64e71014ecef8ca912df34ec
 lib32disabled=yes
 
 # Package build options
 build_options="gir"
-# Enable gir for non-cross builds
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default+=" gir"
-fi
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) build_options_default+=" gir" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir" ;;
+esac
+
+pre_build() {
+	export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs"
+}
 
 libnm-gtk_package() {
 	short_desc+=" - runtime library"