diff --git a/x11/gnome/tracker/Makefile b/x11/gnome/tracker/Makefile
index ea15c8aa774..019878dfe69 100644
--- a/x11/gnome/tracker/Makefile
+++ b/x11/gnome/tracker/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.137 2013/04/10 14:30:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.138 2013/04/10 15:41:47 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,7 +6,7 @@ COMMENT=		powerful desktop search tool and indexer
 
 GNOME_PROJECT=		tracker
 GNOME_VERSION=		0.16.0
-REVISION=		3
+REVISION=		4
 
 # there is already audio/tracker, so this port has to live
 # as meta-tracker.
@@ -122,7 +122,7 @@ MODGNOME_LDFLAGS=	-Wl,-rpath,${TRUEPREFIX}/lib/tracker-${MAJ_V}
 FAKE_FLAGS=		sysconfdir=${PREFIX}/share/examples/meta-tracker/
 
 pre-configure:
-	${SUBST_CMD} ${WRKSRC}/src/tracker-needle/tracker-utils.c
+	${SUBST_CMD} ${WRKSRC}/src/tracker-needle/tracker-utils.vala
 
 post-install:
 	rm ${PREFIX}/lib/tracker-${MAJ_V}/extract-modules/*.la
diff --git a/x11/gnome/tracker/patches/patch-src_tracker-needle_Makefile_in b/x11/gnome/tracker/patches/patch-src_tracker-needle_Makefile_in
new file mode 100644
index 00000000000..c2c739123f3
--- /dev/null
+++ b/x11/gnome/tracker/patches/patch-src_tracker-needle_Makefile_in
@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_tracker-needle_Makefile_in,v 1.1 2013/04/10 15:41:47 ajacoutot Exp $
+
+https://bugzilla.gnome.org/show_bug.cgi?id=697688
+
+--- src/tracker-needle/Makefile.in.orig	Wed Apr 10 17:31:36 2013
++++ src/tracker-needle/Makefile.in	Wed Apr 10 17:31:58 2013
+@@ -499,6 +499,7 @@ AM_VALAFLAGS = \
+ AM_CPPFLAGS = \
+ 	$(BUILD_CFLAGS)                                \
+ 	-D_XOPEN_SOURCE                                \
++	-D_XOPEN_SOURCE_EXTENDED                       \
+ 	-I$(top_srcdir)/src                            \
+ 	-I$(top_builddir)/src                          \
+ 	-DTRACKER_UI_DIR=\"$(datadir)/tracker/\"       \
diff --git a/x11/gnome/tracker/patches/patch-src_tracker-needle_tracker-utils_c b/x11/gnome/tracker/patches/patch-src_tracker-needle_tracker-utils_c
deleted file mode 100644
index 01c9c986d6a..00000000000
--- a/x11/gnome/tracker/patches/patch-src_tracker-needle_tracker-utils_c
+++ /dev/null
@@ -1,24 +0,0 @@
-$OpenBSD: patch-src_tracker-needle_tracker-utils_c,v 1.1 2013/04/10 14:13:53 ajacoutot Exp $
-
-https://bugzilla.gnome.org/show_bug.cgi?id=697688
-
---- src/tracker-needle/tracker-utils.c.orig	Wed Apr 10 08:48:15 2013
-+++ src/tracker-needle/tracker-utils.c	Wed Apr 10 08:51:42 2013
-@@ -20,6 +20,8 @@
- /* 02110-1301, USA.*/
- /**/
- 
-+#define _XOPEN_SOURCE_EXTENDED 1	/* strptime is XPG4v2 */
-+
- #include <glib.h>
- #include <glib-object.h>
- #include <gtk/gtk.h>
-@@ -164,7 +166,7 @@ void uri_launch (const gchar* uri) {
- 			GPid _tmp14_ = 0;
- 			_tmp13_ = argv;
- 			_tmp13__length1 = argv_length1;
--			g_spawn_async ("/usr/bin", _tmp13_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp14_, &_inner_error_);
-+			g_spawn_async ("${LOCALBASE}/bin", _tmp13_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp14_, &_inner_error_);
- 			child_pid = _tmp14_;
- 			if (_inner_error_ != NULL) {
- 				goto __catch22_g_error;
diff --git a/x11/gnome/tracker/patches/patch-src_tracker-needle_tracker-utils_vala b/x11/gnome/tracker/patches/patch-src_tracker-needle_tracker-utils_vala
new file mode 100644
index 00000000000..6d78ba1e7ce
--- /dev/null
+++ b/x11/gnome/tracker/patches/patch-src_tracker-needle_tracker-utils_vala
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_tracker-needle_tracker-utils_vala,v 1.3 2013/04/10 15:41:47 ajacoutot Exp $
+--- src/tracker-needle/tracker-utils.vala.orig	Thu Oct  6 20:47:36 2011
++++ src/tracker-needle/tracker-utils.vala	Thu Oct  6 20:47:48 2011
+@@ -43,7 +43,7 @@ private void uri_launch (string uri) {
+ 		argv[0] = command[0];
+ 
+ 		try {
+-			Process.spawn_async ("/usr/bin",
++			Process.spawn_async ("${LOCALBASE}/bin",
+ 			                     argv,
+ 			                     null, // environment
+ 			                     SpawnFlags.SEARCH_PATH,
diff --git a/x11/gnome/tracker/patches/patch-tests_libtracker-common_tracker-sched-test_c b/x11/gnome/tracker/patches/patch-tests_libtracker-common_tracker-sched-test_c
index 3ce370c76df..c3290156203 100644
--- a/x11/gnome/tracker/patches/patch-tests_libtracker-common_tracker-sched-test_c
+++ b/x11/gnome/tracker/patches/patch-tests_libtracker-common_tracker-sched-test_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-tests_libtracker-common_tracker-sched-test_c,v 1.2 2011/12/16 17:36:55 ajacoutot Exp $
+$OpenBSD: patch-tests_libtracker-common_tracker-sched-test_c,v 1.3 2013/04/10 15:41:47 ajacoutot Exp $
 
-There is no SCHED_IDLE policy on OpenBSD.
+https://bugzilla.gnome.org/show_bug.cgi?id=697728
 
 --- tests/libtracker-common/tracker-sched-test.c.orig	Fri Dec 16 16:38:16 2011
 +++ tests/libtracker-common/tracker-sched-test.c	Fri Dec 16 18:02:12 2011