diff --git a/srcpkgs/telepathy-glib/template b/srcpkgs/telepathy-glib/template
index 1692ba308fc..8af1475d8a2 100644
--- a/srcpkgs/telepathy-glib/template
+++ b/srcpkgs/telepathy-glib/template
@@ -1,31 +1,29 @@
 # Template file for 'telepathy-glib'
 pkgname=telepathy-glib
 version=0.24.1
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool libxslt python glib-devel"
-makedepends="dbus-glib-devel"
+build_helper="gir"
+configure_args="--disable-static $(vopt_enable gir introspection)
+ $(vopt_enable vala vala-bindings)"
+hostmakedepends="pkg-config intltool libxslt python glib-devel
+ $(vopt_if vala vala-devel)"
+makedepends="dbus-glib-devel $(vopt_if vala vala)"
 short_desc="Library for GLib-based Telepathy components"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="LGPL-2.1"
 homepage="http://telepathy.freedesktop.org"
-distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
+distfiles="${homepage}/releases/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=9e0df1d8f857e0270cf0b32e2d1ca5a24aa7282873361785d573f72ad7f7d5eb
 
 # Package build options
-build_options="gir"
-# Disable gir for cross builds.
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
-fi
+build_options="gir vala"
 
-if [ "$build_option_gir" ]; then
-	configure_args+=" --enable-vala-bindings --enable-introspection"
-	makedepends+=" gobject-introspection vala-devel"
-else
-	configure_args+=" --disable-vala-bindings --disable-introspection"
-fi
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) build_options_default+=" gir vala" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir vala" ;;
+esac
 
 telepathy-glib-devel_package() {
 	depends="dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
@@ -35,6 +33,8 @@ telepathy-glib-devel_package() {
 		vmove usr/lib/pkgconfig
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
+		fi
+		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 		vmove usr/share/gtk-doc