diff --git a/x11/gnome/tracker/Makefile b/x11/gnome/tracker/Makefile
index c07558f326f..54908ebde8e 100644
--- a/x11/gnome/tracker/Makefile
+++ b/x11/gnome/tracker/Makefile
@@ -1,20 +1,20 @@
-# $OpenBSD: Makefile,v 1.13 2009/08/30 11:46:14 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2009/10/09 17:40:12 ajacoutot Exp $
 
 COMMENT=	powerful desktop search tool and indexer
 
 # there is already audio/tracker, so this port has to live
 # as tracker-search.
 GNOME_PROJECT=	tracker
-GNOME_VERSION=	0.6.94
-PKGNAME=	tracker-search-${VERSION}p5
+GNOME_VERSION=	0.6.95
+PKGNAME=	tracker-search-${VERSION}
 
-SHARED_LIBS +=	stemmer              0.0      # .694.0
-SHARED_LIBS +=	tracker-common       0.0      # .694.0
-SHARED_LIBS +=	tracker-db           0.0      # .694.0
-SHARED_LIBS +=	tracker-data         0.0      # .694.0
-SHARED_LIBS +=	trackerclient        0.0      # .694.0
+SHARED_LIBS +=	stemmer              0.1      # .695.0
+SHARED_LIBS +=	tracker-common       0.1      # .695.0
+SHARED_LIBS +=	tracker-db           0.1      # .695.0
+SHARED_LIBS +=	tracker-data         0.1      # .695.0
+SHARED_LIBS +=	trackerclient        0.1      # .695.0
 SHARED_LIBS +=	tracker-module       0.0      # .0.0
-SHARED_LIBS +=	tracker-gtk          0.0      # .694.0
+SHARED_LIBS +=	tracker-gtk          0.1      # .695.0
 
 WANTLIB += ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite
 WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr
diff --git a/x11/gnome/tracker/distinfo b/x11/gnome/tracker/distinfo
index 10be926d5f1..c70da499bdd 100644
--- a/x11/gnome/tracker/distinfo
+++ b/x11/gnome/tracker/distinfo
@@ -1,5 +1,5 @@
-MD5 (gnome/tracker-0.6.94.tar.bz2) = EtBQiO8YbHW86dHW+5DgSg==
-RMD160 (gnome/tracker-0.6.94.tar.bz2) = 5w+Cxkr7k0g0Pn1HVA1irGnLm1E=
-SHA1 (gnome/tracker-0.6.94.tar.bz2) = grMvE7Cyk/SgZCrs/6FXtmbRuDU=
-SHA256 (gnome/tracker-0.6.94.tar.bz2) = jQ9XPEmVmPShhk/C/R1dWDQ4yX7HAHYQ1MyuuLmCjYI=
-SIZE (gnome/tracker-0.6.94.tar.bz2) = 1373777
+MD5 (gnome/tracker-0.6.95.tar.bz2) = pO3IqoMAcL0/HYCn3wfIDA==
+RMD160 (gnome/tracker-0.6.95.tar.bz2) = Ews6BxAObBa9Ut4YrmVJWPoRTHg=
+SHA1 (gnome/tracker-0.6.95.tar.bz2) = TM+Mup62l/WLrdrHCo+eNmFrqJg=
+SHA256 (gnome/tracker-0.6.95.tar.bz2) = D+QjUxF8YszJ3js8nBGs9wegcC0wzSS40c0eJYHewzk=
+SIZE (gnome/tracker-0.6.95.tar.bz2) = 1399996
diff --git a/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-mp3_c b/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-mp3_c
index 37f19f0c49e..83d10545369 100644
--- a/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-mp3_c
+++ b/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-mp3_c
@@ -1,12 +1,11 @@
-$OpenBSD: patch-src_tracker-extract_tracker-extract-mp3_c,v 1.2 2009/04/24 14:25:07 jasper Exp $
+$OpenBSD: patch-src_tracker-extract_tracker-extract-mp3_c,v 1.3 2009/10/09 17:40:12 ajacoutot Exp $
 
-- O_NOATIME doesn't exist on *BSD or Solaris.
 - use glib's strndup(), instead of libc's version. Which may not be present
   on every system.
 
---- src/tracker-extract/tracker-extract-mp3.c.orig	Fri Apr 24 16:13:03 2009
-+++ src/tracker-extract/tracker-extract-mp3.c	Fri Apr 24 16:13:11 2009
-@@ -826,7 +826,7 @@ get_id3v24_tags (const gchar *data,
+--- src/tracker-extract/tracker-extract-mp3.c.orig	Wed May 20 18:28:31 2009
++++ src/tracker-extract/tracker-extract-mp3.c	Sat Oct  3 17:44:14 2009
+@@ -853,7 +853,7 @@ get_id3v24_tags (const gchar *data,
  							  NULL, NULL, NULL);
  					break;
  				case 0x03 :
diff --git a/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-mp3_c.orig b/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-mp3_c.orig
new file mode 100644
index 00000000000..a8e0902917e
--- /dev/null
+++ b/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-mp3_c.orig
@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_tracker-extract_tracker-extract-mp3_c.orig,v 1.1 2009/10/09 17:40:12 ajacoutot Exp $
+
+- use glib's strndup(), instead of libc's version. Which may not be present
+  on every system.
+
+--- src/tracker-extract/tracker-extract-mp3.c.orig	Fri Apr 24 16:13:03 2009
++++ src/tracker-extract/tracker-extract-mp3.c	Fri Apr 24 16:13:11 2009
+@@ -826,7 +826,7 @@ get_id3v24_tags (const gchar *data,
+ 							  NULL, NULL, NULL);
+ 					break;
+ 				case 0x03 :
+-					word = strndup (&data[pos+11], csize-1);
++					word = g_strndup (&data[pos+11], csize-1);
+ 					break;
+ 
+ 				default:
diff --git a/x11/gnome/tracker/patches/patch-src_tracker-indexer_tracker-indexer_c b/x11/gnome/tracker/patches/patch-src_tracker-indexer_tracker-indexer_c
new file mode 100644
index 00000000000..6aba65906af
--- /dev/null
+++ b/x11/gnome/tracker/patches/patch-src_tracker-indexer_tracker-indexer_c
@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_tracker-indexer_tracker-indexer_c,v 1.1 2009/10/09 17:40:12 ajacoutot Exp $
+
+We do not support HAL.
+XXX should probably use an ifdef
+
+--- src/tracker-indexer/tracker-indexer.c.orig	Sat Oct  3 18:24:53 2009
++++ src/tracker-indexer/tracker-indexer.c	Sat Oct  3 18:25:02 2009
+@@ -1760,7 +1760,7 @@ item_add_or_update (TrackerIndexer        *indexer,
+ 		/* Service wasn't previously indexed */
+ 		id = tracker_data_update_get_new_service_id (indexer->private->common);
+ 		data = tracker_module_metadata_get_hash_table (metadata);
+-		udi = tracker_hal_udi_get_for_path (indexer->private->hal, service_path);
++		udi = NULL;
+ 
+ 		context = tracker_data_update_metadata_context_new (TRACKER_CONTEXT_TYPE_INSERT,
+ 								    service, id);
diff --git a/x11/gnome/tracker/patches/patch-src_tracker-indexer_tracker-removable-device_c b/x11/gnome/tracker/patches/patch-src_tracker-indexer_tracker-removable-device_c
new file mode 100644
index 00000000000..03f21fe7f84
--- /dev/null
+++ b/x11/gnome/tracker/patches/patch-src_tracker-indexer_tracker-removable-device_c
@@ -0,0 +1,25 @@
+$OpenBSD: patch-src_tracker-indexer_tracker-removable-device_c,v 1.1 2009/10/09 17:40:12 ajacoutot Exp $
+
+We do not support HAL.
+XXX should probably use an ifdef
+
+--- src/tracker-indexer/tracker-removable-device.c.orig	Sat Oct  3 18:24:24 2009
++++ src/tracker-indexer/tracker-removable-device.c	Sat Oct  3 18:24:43 2009
+@@ -119,7 +119,7 @@ commit_turtle_parse_info_storer (TurtleStorerInfo *inf
+ 				data = tracker_module_metadata_get_hash_table (info->metadata);
+ 
+ 				hal = tracker_indexer_get_hal (info->indexer);
+-				udi = tracker_hal_udi_get_for_path (hal, dest_path);
++				udi = NULL;
+ 
+ 				tracker_data_update_delete_service_by_path (path, info->rdf_type);
+ 				tracker_data_update_replace_service (udi,
+@@ -133,7 +133,7 @@ commit_turtle_parse_info_storer (TurtleStorerInfo *inf
+ 				data = tracker_module_metadata_get_hash_table (info->metadata);
+ 
+ 				hal = tracker_indexer_get_hal (info->indexer);
+-				udi = tracker_hal_udi_get_for_path (hal, path);
++				udi = NULL;
+ 
+ 				tracker_data_update_replace_service (udi, 
+ 								     path,
diff --git a/x11/gnome/tracker/patches/patch-src_trackerd_tracker-status_c b/x11/gnome/tracker/patches/patch-src_trackerd_tracker-status_c
new file mode 100644
index 00000000000..1d1c6c0a7b9
--- /dev/null
+++ b/x11/gnome/tracker/patches/patch-src_trackerd_tracker-status_c
@@ -0,0 +1,36 @@
+$OpenBSD: patch-src_trackerd_tracker-status_c,v 1.1 2009/10/09 17:40:12 ajacoutot Exp $
+
+Reorder to prevent undefined reference to `low_disk_space_limit_cb'
+
+--- src/trackerd/tracker-status.c.orig	Sat Oct  3 17:58:04 2009
++++ src/trackerd/tracker-status.c	Sat Oct  3 17:58:22 2009
+@@ -89,6 +89,14 @@ static void disk_space_check_stop   (void);
+ static GStaticPrivate private_key = G_STATIC_PRIVATE_INIT;
+ 
+ static void
++low_disk_space_limit_cb (GObject    *gobject,
++			 GParamSpec *arg1,
++			 gpointer    user_data)
++{
++	disk_space_check_cb (NULL);
++}
++
++static void
+ private_free (gpointer data)
+ {
+ 	TrackerStatusPrivate *private;
+@@ -428,14 +436,6 @@ set_up_throttle (gboolean debugging)
+ 			}
+ 		}
+ 	}
+-}
+-
+-static void
+-low_disk_space_limit_cb (GObject    *gobject,
+-			 GParamSpec *arg1,
+-			 gpointer    user_data)
+-{
+-	disk_space_check_cb (NULL);
+ }
+ 
+ static void
diff --git a/x11/gnome/tracker/pkg/PLIST b/x11/gnome/tracker/pkg/PLIST
index 40ad4a1ff51..e608981b989 100644
--- a/x11/gnome/tracker/pkg/PLIST
+++ b/x11/gnome/tracker/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2009/08/30 11:46:14 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.7 2009/10/09 17:40:12 ajacoutot Exp $
 @bin bin/tracker-applet
 @bin bin/tracker-files
 @bin bin/tracker-info
@@ -158,15 +158,6 @@ lib/tracker/libtracker-db.la
 lib/tracker/libtracker-module.a
 lib/tracker/libtracker-module.la
 @lib lib/tracker/libtracker-module.so.${LIBtracker-module_VERSION}
-lib/tracker/push-modules/
-lib/tracker/push-modules/daemon/
-lib/tracker/push-modules/daemon/libtracker-module_kmail-daemon-module.a
-lib/tracker/push-modules/daemon/libtracker-module_kmail-daemon-module.la
-lib/tracker/push-modules/daemon/libtracker-module_kmail-daemon-module.so
-lib/tracker/push-modules/indexer/
-lib/tracker/push-modules/indexer/libtracker-module_kmail-indexer-module.a
-lib/tracker/push-modules/indexer/libtracker-module_kmail-indexer-module.la
-lib/tracker/push-modules/indexer/libtracker-module_kmail-indexer-module.so
 @bin libexec/tracker-extract
 @bin libexec/tracker-indexer
 @bin libexec/trackerd