diff --git a/x11/gnome/tracker/Makefile b/x11/gnome/tracker/Makefile
index 98383022709..903af4d9a72 100644
--- a/x11/gnome/tracker/Makefile
+++ b/x11/gnome/tracker/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.89 2011/12/16 17:36:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.90 2012/01/01 09:02:11 ajacoutot Exp $
 
 # XXX Binary files patch-src_tracker-control_tracker-control-general_c
 # and patch-src_tracker-control_tracker-control-general_c.new differ
@@ -21,6 +21,8 @@ PKGNAME-main=		meta-tracker-${VERSION}
 PKGNAME-evolution=	evolution-meta-tracker-${VERSION}
 PKGNAME-nautilus=	nautilus-meta-tracker-${VERSION}
 
+REVISION-main=	1
+
 MAJ_V=		${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 EVO_VERSION=	3.2
 SUBST_VARS=	MAJ_V EVO_VERSION
diff --git a/x11/gnome/tracker/patches/patch-src_libtracker-miner_tracker-monitor_c b/x11/gnome/tracker/patches/patch-src_libtracker-miner_tracker-monitor_c
new file mode 100644
index 00000000000..f88e4e60b2c
--- /dev/null
+++ b/x11/gnome/tracker/patches/patch-src_libtracker-miner_tracker-monitor_c
@@ -0,0 +1,23 @@
+$OpenBSD: patch-src_libtracker-miner_tracker-monitor_c,v 1.3 2012/01/01 09:02:11 ajacoutot Exp $
+
+Recognize the gio-kqueue monitoring backend.
+(not to be pushed upstream before the glib changes are there first)
+
+--- src/libtracker-miner/tracker-monitor.c.orig	Fri Dec 30 15:12:53 2011
++++ src/libtracker-miner/tracker-monitor.c	Fri Dec 30 15:17:59 2011
+@@ -294,6 +294,15 @@ tracker_monitor_init (TrackerMonitor *object)
+ 			 */
+ 			priv->monitor_limit = MAX (priv->monitor_limit, 0);
+ 		}
++		else if (strcmp (name, "GKqueueDirectoryMonitor") == 0) {
++			/* Using kqueue(2) */
++			g_message ("Monitor backend is kqueue(2)");
++
++			/*
++			 * XXX use getrlimit(2) (or its glib equivalent)
++			 */
++			priv->monitor_limit = 400;
++		}
+ 		else if (strcmp (name, "GFamDirectoryMonitor") == 0) {
+ 			/* Using Fam */
+ 			g_message ("Monitor backend is Fam");
diff --git a/x11/gnome/tracker/patches/patch-src_miners_fs_tracker-config_c b/x11/gnome/tracker/patches/patch-src_miners_fs_tracker-config_c
index 2c6a8d6c355..4c4e26f31db 100644
--- a/x11/gnome/tracker/patches/patch-src_miners_fs_tracker-config_c
+++ b/x11/gnome/tracker/patches/patch-src_miners_fs_tracker-config_c
@@ -1,13 +1,12 @@
-$OpenBSD: patch-src_miners_fs_tracker-config_c,v 1.6 2011/09/26 12:31:40 ajacoutot Exp $
+$OpenBSD: patch-src_miners_fs_tracker-config_c,v 1.7 2012/01/01 09:02:11 ajacoutot Exp $
 
 Set some sane defaults (which can be changed in the preferences):
 * set default indexing speed to 10 (i.e. medium value 0->20)
 * don't index removable devices
-* stop indexing if available space is =< 5%
 
---- src/miners/fs/tracker-config.c.orig	Mon Sep 26 11:28:36 2011
-+++ src/miners/fs/tracker-config.c	Mon Sep 26 12:28:06 2011
-@@ -37,12 +37,12 @@
+--- src/miners/fs/tracker-config.c.orig	Fri Dec 16 16:24:23 2011
++++ src/miners/fs/tracker-config.c	Sat Dec 31 10:09:31 2011
+@@ -37,8 +37,8 @@
  #define DEFAULT_SCHED_IDLE                       1
  #define DEFAULT_INITIAL_SLEEP                    15       /* 0->1000 */
  #define DEFAULT_ENABLE_MONITORS                  TRUE
@@ -18,8 +17,3 @@ Set some sane defaults (which can be changed in the preferences):
  #define DEFAULT_INDEX_OPTICAL_DISCS              FALSE
  #define DEFAULT_INDEX_ON_BATTERY                 FALSE
  #define DEFAULT_INDEX_ON_BATTERY_FIRST_TIME      TRUE
--#define DEFAULT_LOW_DISK_SPACE_LIMIT             1        /* 0->100 / -1 */
-+#define DEFAULT_LOW_DISK_SPACE_LIMIT             5        /* 0->100 / -1 */
- #define DEFAULT_CRAWLING_INTERVAL                -1       /* 0->365 / -1 / -2 */
- #define DEFAULT_REMOVABLE_DAYS_THRESHOLD         3        /* 1->365 / 0  */
- #define DEFAULT_ENABLE_WRITEBACK                 FALSE