diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 0ac5d828e78..066fd816dae 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,9 +1,9 @@
 # Template file for 'tracker'
 pkgname=tracker
-version=3.5.0
-revision=3
+version=3.6.0
+revision=1
 build_style=meson
-build_helper="gir"
+build_helper="gir qemu"
 configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
  -Dsystemd_user_services=false"
 hostmakedepends="gettext pkg-config glib-devel vala asciidoc
@@ -17,11 +17,12 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Tracker"
 changelog="https://gitlab.gnome.org/GNOME/tracker/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=13294275dbbbad9634b3a8390c08e6f12bebfe84f6ccafb72b27b0c23ba8da2f
+checksum=52592cfe19baffd16dbe47475be7da750dbd0b6333fd7acb60faa9da5bc40df2
 make_check_pre="dbus-run-session"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" dbus"
+	configure_args+=" --cross-file=${XBPS_WRAPPERDIR}/meson/xbps_sqlite.cross"
 fi
 
 if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
@@ -31,7 +32,15 @@ fi
 post_patch() {
 	if [ "$CROSS_BUILD" ]; then
 		# Tell the build system that we have internal fts5 in sqlite3
-		vsed -i "/\[properties\]/a sqlite3_has_fts5 = 'true'" xbps_meson.cross
+		cat > "${XBPS_WRAPPERDIR}/meson/xbps_sqlite.cross" <<-EOF
+			[properties]
+			sqlite3_has_fts5 = 'true'
+			EOF
+	fi
+
+	# Patch out error due to y2k38 on musl
+	if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
+		vsed -e "s/error('Libc implementation has broken 4-digit years implementation.')/year_modifier = '%2C%y'/" -i meson.build
 	fi
 }