diff --git a/configure.in b/configure.in
index d48723c..364d7d0 100644
--- a/configure.in
+++ b/configure.in
@@ -527,7 +527,7 @@ for plugin in ${used_plugins}; do
 			fi
 		;;
 		tracker)
-			PKG_CHECK_MODULES(TRACKER, tracker-client-0.7 >= 0.7.1, [HAVE_TRACKER=yes], [HAVE_TRACKER=no])
+			PKG_CHECK_MODULES(TRACKER, tracker-client-0.8 >= 0.8.0, [HAVE_TRACKER=yes], [HAVE_TRACKER=no])
 			if test "${HAVE_TRACKER}" != "yes" ; then
 				plugin_error_or_ignore "you need the tracker development headers installed for the tracker plugin"
 				add_plugin="0"
diff --git a/src/plugins/tracker/totem-tracker-widget.c b/src/plugins/tracker/totem-tracker-widget.c
index 86f66de..fc73b88 100644
--- a/src/plugins/tracker/totem-tracker-widget.c
+++ b/src/plugins/tracker/totem-tracker-widget.c
@@ -31,7 +31,7 @@
 #include <glib/gi18n-lib.h>
 #include <gio/gio.h>
 #include <dbus/dbus.h>
-#include <libtracker-client/tracker.h>
+#include <libtracker-client/tracker-client.h>
 
 #include "totem-tracker-widget.h"
 #include "totem-cell-renderer-video.h"
@@ -188,7 +188,7 @@ search_results_new (TotemTrackerWidget *widget,
 		return NULL;
 	}
 
-	client = tracker_connect (TRUE, G_MAXINT);
+	client = tracker_client_new (TRUE, G_MAXINT);
 	if (!client) {
 		return NULL;
 	}
@@ -214,7 +214,7 @@ search_results_free (SearchResultsData *srd)
 	}
 
 	if (srd->client) {
-		tracker_disconnect (srd->client);
+		g_object_unref (srd->client);
 	}
 
 	g_free (srd->search_text);
@@ -408,7 +408,7 @@ do_search (TotemTrackerWidget *widget)
 	}
 
 	if (fts) {
-		query = g_strdup_printf ("SELECT ?urn "
+		query = g_strdup_printf ("SELECT nie:url(?urn) "
 					 "WHERE {"
 					 "  ?urn a ?type ."
 					 "  ?urn fts:match \"%s\" "
@@ -421,7 +421,7 @@ do_search (TotemTrackerWidget *widget)
 					 offset,
 					 TOTEM_TRACKER_MAX_RESULTS_SIZE);
 	} else {
-		query = g_strdup_printf ("SELECT ?urn "
+		query = g_strdup_printf ("SELECT nie:url(?urn) "
 					 "WHERE {"
 					 "  ?urn a ?type ."
 					 "  FILTER (?type = nmm:Video) "
diff --git a/src/plugins/tracker/totem-tracker-widget.h b/src/plugins/tracker/totem-tracker-widget.h
index bf87b37..5bb2845 100644
--- a/src/plugins/tracker/totem-tracker-widget.h
+++ b/src/plugins/tracker/totem-tracker-widget.h
@@ -25,7 +25,7 @@
 #include "totem.h"
 
 #include <gtk/gtk.h>
-#include <libtracker-client/tracker.h>
+#include <libtracker-client/tracker-client.h>
 
 #define TOTEM_TYPE_TRACKER_WIDGET               (totem_tracker_widget_get_type ())
 #define TOTEM_TRACKER_WIDGET(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), TOTEM_TYPE_TRACKER_WIDGET, TotemTrackerWidget))
