diff --git a/srcpkgs/libgdata/template b/srcpkgs/libgdata/template
index a790737ce1..74dd66056f 100644
--- a/srcpkgs/libgdata/template
+++ b/srcpkgs/libgdata/template
@@ -1,22 +1,31 @@
 # Template file for 'libgdata'
 pkgname=libgdata
 version=0.17.9
-revision=2
+revision=3
+build_helper="gir"
 build_style=gnu-configure
-configure_args="--disable-static $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config flex intltool glib-devel $(vopt_if gir gobject-introspection)"
-makedepends="json-glib-devel gtk+3-devel uhttpmock-devel liboauth-devel gcr-devel gnome-online-accounts-devel"
+configure_args="--disable-static $(vopt_enable gir introspection)
+ $(vopt_enable vala)"
+hostmakedepends="pkg-config flex intltool glib-devel $(vopt_if vala vala)"
+makedepends="json-glib-devel gtk+3-devel uhttpmock-devel liboauth-devel
+ gcr-devel gnome-online-accounts-devel"
 short_desc="Library for accessing GData webservices"
-maintainer="Juan RP <xtraeme@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://live.gnome.org/libgdata"
-distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
+maintainer="Rasmus Thosen <oss@cogitri.dev>"
+license="LGPL-2.1-or-later"
+homepage="https://wiki.gnome.org/Projects/libgdata"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=85c4f7674c0098ffaf060ae01b6b832cb277b3673d54ace3bdedaad6b127453a
 
-build_options="gir"
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
-fi
+build_options="gir vala"
+case "$XBPS_TARGET_MACHINE" in
+	i686-musl|x86_64-musl) build_options_default+=" gir vala" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir vala" ;;
+esac
+
+pre_build() {
+	export GIR_EXTRA_LIBS_PATH="${wrksrc}/gdata/.libs"
+}
 
 libgdata-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -29,5 +38,8 @@ libgdata-devel_package() {
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 	}
 }