diff --git a/x11/gnome/tracker/Makefile b/x11/gnome/tracker/Makefile
index 17344f427e1..8a8fb8b8ea2 100644
--- a/x11/gnome/tracker/Makefile
+++ b/x11/gnome/tracker/Makefile
@@ -1,10 +1,12 @@
-# $OpenBSD: Makefile,v 1.2 2009/04/21 22:48:21 jasper Exp $
+# $OpenBSD: Makefile,v 1.3 2009/04/21 23:39:43 jasper 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.93
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	tracker-search-${VERSION}
 
 SHARED_LIBS +=	stemmer              0.0      # .693.0
 SHARED_LIBS +=	tracker-common       0.0      # .693.0
@@ -59,16 +61,6 @@ RUN_DEPENDS=		::devel/glib2,-fam \
 			::www/w3m \
 			::x11/gnome/deskbar-applet
 
-# Allow tracker to index the media files these gstreamer packages
-# can grok. To not force a huge pile of dependencies on the user
-# only install a base set.
-RUN_DEPENDS+=	:gstreamer-vorbis-*:multimedia/gstreamer-0.10/plugins-base,-vorbis \
-		:gstreamer-ogg-*:multimedia/gstreamer-0.10/plugins-base,-ogg \
-		:gstreamer-theora-*:multimedia/gstreamer-0.10/plugins-base,-theora \
-		:gstreamer-jpeg-*:multimedia/gstreamer-0.10/plugins-good,-jpeg \
-		:gstreamer-png-*:multimedia/gstreamer-0.10/plugins-good,-png \
-		:gstreamer-confelements-*:multimedia/gstreamer-0.10/plugins-good,-gconf
-
 DESKTOP_FILES=		Yes
 MODPY_RUNDEP=		No
 
@@ -89,4 +81,7 @@ CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/data/modules/applications.module
+
 .include <bsd.port.mk>
diff --git a/x11/gnome/tracker/patches/patch-data_modules_applications_module b/x11/gnome/tracker/patches/patch-data_modules_applications_module
new file mode 100644
index 00000000000..9eeaf3f6c36
--- /dev/null
+++ b/x11/gnome/tracker/patches/patch-data_modules_applications_module
@@ -0,0 +1,12 @@
+$OpenBSD: patch-data_modules_applications_module,v 1.1 2009/04/21 23:39:43 jasper Exp $
+--- data/modules/applications.module.orig	Wed Apr 22 01:26:02 2009
++++ data/modules/applications.module	Wed Apr 22 01:26:12 2009
+@@ -4,7 +4,7 @@ Enabled=true
+ 
+ [Monitors]
+ Directories=
+-RecurseDirectories=/usr/share/applications;
++RecurseDirectories=${LOCALBASE}/share/applications;
+ 
+ [Ignored]
+ Directories=
diff --git a/x11/gnome/tracker/patches/patch-src_tracker-utils_Makefile_in b/x11/gnome/tracker/patches/patch-src_tracker-utils_Makefile_in
deleted file mode 100644
index cf1ae6f7a64..00000000000
--- a/x11/gnome/tracker/patches/patch-src_tracker-utils_Makefile_in
+++ /dev/null
@@ -1,40 +0,0 @@
-$OpenBSD: patch-src_tracker-utils_Makefile_in,v 1.1 2009/04/21 22:48:22 jasper Exp $
-
-Don't build tracker-processes, which depends on /proc being present.
-
---- src/tracker-utils/Makefile.in.orig	Wed Apr 22 00:38:13 2009
-+++ src/tracker-utils/Makefile.in	Wed Apr 22 00:38:53 2009
-@@ -48,7 +48,7 @@ bin_PROGRAMS = tracker-search$(EXEEXT) tracker-query$(
- 	tracker-meta-folder$(EXEEXT) tracker-stats$(EXEEXT) \
- 	tracker-tag$(EXEEXT) tracker-files$(EXEEXT) \
- 	tracker-status$(EXEEXT) tracker-unique$(EXEEXT) \
--	tracker-info$(EXEEXT) tracker-processes$(EXEEXT) \
-+	tracker-info$(EXEEXT) \
- 	tracker-services$(EXEEXT)
- subdir = src/tracker-utils
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -115,13 +115,13 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOO
- 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
- SOURCES = $(tracker_files_SOURCES) $(tracker_info_SOURCES) \
--	$(tracker_meta_folder_SOURCES) $(tracker_processes_SOURCES) \
-+	$(tracker_meta_folder_SOURCES) \
- 	$(tracker_query_SOURCES) $(tracker_search_SOURCES) \
- 	$(tracker_services_SOURCES) $(tracker_stats_SOURCES) \
- 	$(tracker_status_SOURCES) $(tracker_tag_SOURCES) \
- 	$(tracker_unique_SOURCES)
- DIST_SOURCES = $(tracker_files_SOURCES) $(tracker_info_SOURCES) \
--	$(tracker_meta_folder_SOURCES) $(tracker_processes_SOURCES) \
-+	$(tracker_meta_folder_SOURCES) \
- 	$(tracker_query_SOURCES) $(tracker_search_SOURCES) \
- 	$(tracker_services_SOURCES) $(tracker_stats_SOURCES) \
- 	$(tracker_status_SOURCES) $(tracker_tag_SOURCES) \
-@@ -420,8 +420,6 @@ tracker_unique_SOURCES = tracker-unique.c
- tracker_unique_LDADD = $(libs)
- tracker_info_SOURCES = tracker-info.c
- tracker_info_LDADD = $(libs)
--tracker_processes_SOURCES = tracker-processes.c
--tracker_processes_LDADD = $(libs)
- tracker_services_SOURCES = tracker-services.c
- tracker_services_LDADD = $(libs)
- all: all-am
diff --git a/x11/gnome/tracker/pkg/PLIST b/x11/gnome/tracker/pkg/PLIST
index af618ffb30f..b560fd3d4a4 100644
--- a/x11/gnome/tracker/pkg/PLIST
+++ b/x11/gnome/tracker/pkg/PLIST
@@ -1,9 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.2 2009/04/21 22:48:22 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.3 2009/04/21 23:39:43 jasper Exp $
 @bin bin/tracker-applet
 @bin bin/tracker-files
 @bin bin/tracker-info
 @bin bin/tracker-meta-folder
 @bin bin/tracker-preferences
+@bin bin/tracker-processes
 @bin bin/tracker-query
 @bin bin/tracker-search
 @bin bin/tracker-search-tool