diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 59905210af0..ad3c74c456c 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,8 +1,9 @@
 # Template file for 'gnome-online-accounts'
 pkgname=gnome-online-accounts
-version=3.30.1
-revision=2
+version=3.30.2
+revision=1
 build_style=gnu-configure
+build_helper="gir"
 configure_args="$(vopt_enable gir introspection)
  --enable-documentation --enable-backend
  --enable-google --enable-kerberos --enable-flickr --enable-telepathy
@@ -10,7 +11,7 @@ configure_args="$(vopt_enable gir introspection)
  --enable-owncloud --enable-windows-live --enable-yahoo --enable-pocket
  --enable-todoist --enable-lastfm --enable-media-server"
 hostmakedepends="docbook-xsl gettext-devel glib-devel gnome-common
- gobject-introspection intltool libxslt pkg-config vala-devel"
+ intltool libxslt pkg-config $(vopt_if vala vala)"
 makedepends="gcr-devel gtk+3-devel json-glib-devel libnotify-devel libsecret-devel
  libsoup-devel mit-krb5-devel rest-devel telepathy-glib-devel webkit2gtk-devel"
 depends="hicolor-icon-theme"
@@ -19,12 +20,14 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7e968a325e959f0b2419bed5a4c5b6d3a9327aceebd72f4fb01478c78ce85b41
+checksum=05c7e588c884a4145db376880303588f74b76d1fa11afbeccb74c6eff36b2fdc
 
-build_options="gir"
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default+=" gir"
-fi
+build_options="gir vala"
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) build_options_default+=" gir vala" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir vala" ;;
+esac
 
 gnome-online-accounts-devel_package() {
 	depends="gtk+3-devel ${sourcepkg}>=${version}_${revision}"
@@ -35,8 +38,10 @@ gnome-online-accounts-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/goa-1.0
 		if [ "$build_option_gir" ]; then
-			vmove usr/share/vala
 			vmove usr/share/gir-1.0
 		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 	}
 }