diff --git a/common/shlibs b/common/shlibs
index 222ce710d93..95f5918baf9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3174,7 +3174,7 @@ libykclient.so.3 ykclient-2.15_1
 libbooster.so.0 cppcms-1.0.5_1
 libcppcms.so.1 cppcms-1.0.5_1
 libcppdb.so.0 cppdb-0.3.1_1
-libtracker-sparql-3.0.so.0 libtracker-3.0.0_1
+libtinysparql-3.0.so.0 libtinysparql-3.8.0_1
 libdockapp.so.3 libdockapp-0.7.2_1
 libkrdccore.so.5 krdc-17.04.3_1
 libArcus.so.3 libArcus-3.1.0_1
diff --git a/srcpkgs/libtinysparql b/srcpkgs/libtinysparql
new file mode 120000
index 00000000000..551412b1f42
--- /dev/null
+++ b/srcpkgs/libtinysparql
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker b/srcpkgs/libtracker
index b471d39eca1..551412b1f42 120000
--- a/srcpkgs/libtracker
+++ b/srcpkgs/libtracker
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/libtracker3 b/srcpkgs/libtracker3
index b471d39eca1..551412b1f42 120000
--- a/srcpkgs/libtracker3
+++ b/srcpkgs/libtracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tinysparql-devel b/srcpkgs/tinysparql-devel
new file mode 120000
index 00000000000..551412b1f42
--- /dev/null
+++ b/srcpkgs/tinysparql-devel
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tinysparql/patches/disable-cli-test.patch
similarity index 100%
rename from srcpkgs/tracker/patches/disable-cli-test.patch
rename to srcpkgs/tinysparql/patches/disable-cli-test.patch
diff --git a/srcpkgs/tinysparql/patches/gh-ci-timeout.patch b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
new file mode 100644
index 00000000000..6f004e300b9
--- /dev/null
+++ b/srcpkgs/tinysparql/patches/gh-ci-timeout.patch
@@ -0,0 +1,22 @@
+Partially revert 5bbf312ddb9fb4a9e834aaceba80a6fdbaefec11 to avoid infinate loop in github actions
+
+--- b/tests/functional-tests/sandbox.py
++++ a/tests/functional-tests/sandbox.py
+@@ -37,7 +37,6 @@
+ log = logging.getLogger(__name__)
+ 
+ TRACKER_DBUS_PREFIX = 'org.freedesktop.Tracker3'
+-TRACKER_PORTAL_NAME = 'org.freedesktop.portal.Tracker'
+ 
+ _process_list = []
+ 
+@@ -109,7 +108,7 @@
+ 
+         log.info("Looking for active Tracker processes on the session bus")
+         for busname in self.session_bus.list_names_sync():
++            if busname.startswith(TRACKER_DBUS_PREFIX):
+-            if busname.startswith(TRACKER_DBUS_PREFIX) or busname == TRACKER_PORTAL_NAME:
+                 pid = self.session_bus.get_connection_unix_process_id_sync(busname)
+                 if pid is not None:
+                     tracker_processes.append(pid)
+
diff --git a/srcpkgs/tracker/template b/srcpkgs/tinysparql/template
similarity index 67%
rename from srcpkgs/tracker/template
rename to srcpkgs/tinysparql/template
index 0a96c95fd85..06751532f8d 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tinysparql/template
@@ -1,7 +1,7 @@
-# Template file for 'tracker'
-pkgname=tracker
-version=3.7.3
-revision=3
+# Template file for 'tinysparql'
+pkgname=tinysparql
+version=3.8.0
+revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -11,13 +11,13 @@ hostmakedepends="gettext pkg-config glib-devel vala asciidoc dbus
 makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
  libsoup-devel libsoup3-devel libxml2-devel sqlite-devel bash-completion"
 checkdepends="dbus tar python3-gobject"
-short_desc="Personal search tool and storage system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Low-footprint RDF triple store library with SPARQL 1.1 interface"
+maintainer="oreo639 <oreo6391@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/tinysparql"
 changelog="https://gitlab.gnome.org/GNOME/tinysparql/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=ab3d4a50937e04c5ed7846f6dbb999e2909819402f389ca592ee6b77dd28d1f9
+distfiles="${GNOME_SITE}/tinysparql/${version%.*}/tinysparql-${version}.tar.xz"
+checksum=c0fcda77520f531548b2395137dcd193ee9cde5e222d3c9d273f030d1762a504
 make_check_pre="dbus-run-session"
 
 if [ "$CROSS_BUILD" ]; then
@@ -41,10 +41,13 @@ post_patch() {
 	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
+	# Increase timeout for github actions
+	vsed -e 's/timeout: 30/timeout: 60/g' -i tests/functional-tests/meson.build
 }
 
-tracker-devel_package() {
-	depends="libtracker>=${version}_${revision} libglib-devel sqlite-devel"
+tinysparql-devel_package() {
+	depends="libtinysparql>=${version}_${revision} libglib-devel
+	 json-glib-devel libxml2-devel sqlite-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -55,7 +58,7 @@ tracker-devel_package() {
 	}
 }
 
-libtracker_package() {
+libtinysparql_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
@@ -63,6 +66,24 @@ libtracker_package() {
 	}
 }
 
+tracker_package() {
+	depends="tinysparql>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+tracker-devel_package() {
+	depends="tinysparql-devel>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+libtracker_package() {
+	depends="libtinysparql>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
 tracker3_package() {
 	depends="tracker>=${version}_${revision}"
 	short_desc+=" - transitional dummy package"
diff --git a/srcpkgs/tracker b/srcpkgs/tracker
new file mode 120000
index 00000000000..551412b1f42
--- /dev/null
+++ b/srcpkgs/tracker
@@ -0,0 +1 @@
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker-devel b/srcpkgs/tracker-devel
index b471d39eca1..551412b1f42 120000
--- a/srcpkgs/tracker-devel
+++ b/srcpkgs/tracker-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3 b/srcpkgs/tracker3
index b471d39eca1..551412b1f42 120000
--- a/srcpkgs/tracker3
+++ b/srcpkgs/tracker3
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file
diff --git a/srcpkgs/tracker3-devel b/srcpkgs/tracker3-devel
index b471d39eca1..551412b1f42 120000
--- a/srcpkgs/tracker3-devel
+++ b/srcpkgs/tracker3-devel
@@ -1 +1 @@
-tracker
\ No newline at end of file
+tinysparql
\ No newline at end of file