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
index 6aba65906af..e54c02803ef 100644
--- a/x11/gnome/tracker/patches/patch-src_tracker-indexer_tracker-indexer_c
+++ b/x11/gnome/tracker/patches/patch-src_tracker-indexer_tracker-indexer_c
@@ -1,16 +1,19 @@
-$OpenBSD: patch-src_tracker-indexer_tracker-indexer_c,v 1.1 2009/10/09 17:40:12 ajacoutot Exp $
+$OpenBSD: patch-src_tracker-indexer_tracker-indexer_c,v 1.2 2009/10/15 20:55:08 jasper 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,
+--- src/tracker-indexer/tracker-indexer.c.orig	Wed May 20 18:28:31 2009
++++ src/tracker-indexer/tracker-indexer.c	Thu Oct 15 14:04:13 2009
+@@ -1760,8 +1760,11 @@ 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);
++#ifdef HAVE_HAL
+ 		udi = tracker_hal_udi_get_for_path (indexer->private->hal, service_path);
+-
++#else
 +		udi = NULL;
- 
++#endif
  		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
index 03f21fe7f84..999f3214840 100644
--- 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
@@ -1,25 +1,30 @@
-$OpenBSD: patch-src_tracker-indexer_tracker-removable-device_c,v 1.1 2009/10/09 17:40:12 ajacoutot Exp $
+$OpenBSD: patch-src_tracker-indexer_tracker-removable-device_c,v 1.2 2009/10/15 20:55:08 jasper 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
+--- src/tracker-indexer/tracker-removable-device.c.orig	Mon May 11 18:15:55 2009
++++ src/tracker-indexer/tracker-removable-device.c	Thu Oct 15 14:06:44 2009
+@@ -119,7 +119,11 @@ 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);
++#ifdef HAVE_HAL
+ 				udi = tracker_hal_udi_get_for_path (hal, dest_path);
++#else
 +				udi = NULL;
++#endif
  
  				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
+@@ -133,7 +137,11 @@ 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);
++#ifdef HAVE_HAL
+ 				udi = tracker_hal_udi_get_for_path (hal, path);
++#else
 +				udi = NULL;
++#endif
  
  				tracker_data_update_replace_service (udi, 
  								     path,