diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index f2e17869958..0ebb66ec1c1 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,7 +1,7 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
 version=1.0.10
-revision=2
+revision=3
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--disable-static --without-bluetooth
@@ -23,16 +23,17 @@ checksum=b045ac3eaa68ccbbefe91510ad67b4002a7e09d1e5ce1c4bf9a67619bd2cf0eb
 
 # 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
-	*-musl) # Disable gir for musl (broken on x86_64-musl)
-		;;
-	*)	# Enable gir for non-cross builds
-		if [ -z "$CROSS_BUILD" ]; then
-			build_options_default+=" gir"
-		fi
-		;;
-esac
+CFLAGS="-O2 -pipe"
+_gccver=$(gcc --version|awk '/^gcc \(GCC\)/ { print $3 }')
+if [ "${_gccver%%.*}" -gt 5 ]; then
+	# Fix gcc6 build error for warning -Wmisleading-indentation
+	CFLAGS+=" -Wno-error=misleading-indentation"
+fi
 
 libnm-gtk_package() {
 	short_desc+=" - runtime library"