diff --git a/srcpkgs/zeitgeist/template b/srcpkgs/zeitgeist/template
index fad99bd5adb..b943be03c29 100644
--- a/srcpkgs/zeitgeist/template
+++ b/srcpkgs/zeitgeist/template
@@ -1,29 +1,31 @@
 # Template file for 'zeitgeist'
 pkgname=zeitgeist
-version=1.0.1
+version=1.0.2
 revision=1
 build_style=gnu-configure
+build_helper="gir"
 configure_args="--enable-fts --enable-datahub $(vopt_enable gir introspection)"
+pycompile_module="zeitgeist"
 hostmakedepends="automake libtool pkg-config gettext-devel
- intltool vala-devel $(vopt_if gir gobject-introspection)"
-makedepends="
- python-rdflib json-glib-devel gtk+3-devel telepathy-glib-devel
+ intltool $(vopt_if vala vala) python-rdflib"
+makedepends="json-glib-devel gtk+3-devel telepathy-glib-devel
  python-gobject-devel dbus-devel sqlite-devel xapian-core-devel raptor"
 depends="python-dbus python-gobject"
-pycompile_module="zeitgeist"
 short_desc="Logs the users’ activities and events"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
+license="LGPL-2.1-or-later"
 homepage="https://launchpad.net/zeitgeist/"
-license="LGPL-2.1"
 distfiles="https://launchpad.net/zeitgeist/${version%.*}/${version}/+download/zeitgeist-${version}.tar.xz"
-checksum=7de6a8e7b8aed33490437e522a9bf2e531681118c8cd91c052d554bbe64435bd
+checksum=d023b5904c7076b2701df915dd29b77e256a86d9e80ecfb92f36c9f26371a8ce
 
 # 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"
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) build_options_default+=" gir vala" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir vala" ;;
+esac
 
 pre_configure() {
 	NOCONFIGURE=1 autoreconf -fi
@@ -42,14 +44,17 @@ libzeitgeist2_package() {
 		fi
 	}
 }
+
 zeitgeist-devel_package() {
 	short_desc+=" - development files"
 	depends="libzeitgeist2-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.so
-		vmove usr/share/vala
+		vmove "usr/lib/*.so"
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi