diff --git a/x11/gnome/tracker/Makefile b/x11/gnome/tracker/Makefile
index 5bde97cbb82..89977d73753 100644
--- a/x11/gnome/tracker/Makefile
+++ b/x11/gnome/tracker/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.30 2010/04/29 17:06:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.31 2010/05/07 07:22:47 ajacoutot Exp $
 
 COMMENT=	powerful desktop search tool and indexer
 
 GNOME_PROJECT=	tracker
-GNOME_VERSION=	0.8.4
+GNOME_VERSION=	0.8.5
 
 # there is already audio/tracker, so this port has to live
 # as tracker-search.
-PKGNAME=	tracker-search-${VERSION}p0
+PKGNAME=	tracker-search-${VERSION}
 
 EVO_VERSION=	2.30
 SUBST_VARS=	EVO_VERSION
diff --git a/x11/gnome/tracker/distinfo b/x11/gnome/tracker/distinfo
index 542f6cc72b4..2ca7cf2c9e6 100644
--- a/x11/gnome/tracker/distinfo
+++ b/x11/gnome/tracker/distinfo
@@ -1,5 +1,5 @@
-MD5 (gnome/tracker-0.8.4.tar.bz2) = xVObYVIMUSudu6HZl1MXsQ==
-RMD160 (gnome/tracker-0.8.4.tar.bz2) = +Cj11zmAw62qetqeC4+8XFFuSMc=
-SHA1 (gnome/tracker-0.8.4.tar.bz2) = QBAhIVe9LLEyuYt88ikFTA1S00s=
-SHA256 (gnome/tracker-0.8.4.tar.bz2) = 7w1gCJ0Hm3ZL/VHM+L6ygs2EvU7n9PQQW6iwOWMuUGs=
-SIZE (gnome/tracker-0.8.4.tar.bz2) = 5306288
+MD5 (gnome/tracker-0.8.5.tar.bz2) = wzL9cRW0X4AB1fc6W1FQnw==
+RMD160 (gnome/tracker-0.8.5.tar.bz2) = CSCXyB0SRXmEAM/ibrLDJ80UI4U=
+SHA1 (gnome/tracker-0.8.5.tar.bz2) = JsE4raV6ZKWhmjyozoCy25Qg28M=
+SHA256 (gnome/tracker-0.8.5.tar.bz2) = hO05wbq7A3Qjpjw5POdo+fhWrp5Fu1Sne4cXzBo6DYU=
+SIZE (gnome/tracker-0.8.5.tar.bz2) = 5210538
diff --git a/x11/gnome/tracker/patches/patch-configure b/x11/gnome/tracker/patches/patch-configure
index d5161614a68..110082f4981 100644
--- a/x11/gnome/tracker/patches/patch-configure
+++ b/x11/gnome/tracker/patches/patch-configure
@@ -1,11 +1,11 @@
-$OpenBSD: patch-configure,v 1.4 2010/04/16 06:36:50 ajacoutot Exp $
+$OpenBSD: patch-configure,v 1.5 2010/05/07 07:22:47 ajacoutot Exp $
 
 uuid_generate(3):
     needs e2fs-uuid from sysutils/e2fsprogs over libuuid (devel/uuid).
 
---- configure.orig	Thu Apr 15 17:51:09 2010
-+++ configure	Thu Apr 15 19:25:42 2010
-@@ -17021,12 +17021,12 @@ if test -n "$PKG_CONFIG"; then
+--- configure.orig	Thu May  6 19:30:11 2010
++++ configure	Fri May  7 08:49:44 2010
+@@ -17061,12 +17061,12 @@ if test -n "$PKG_CONFIG"; then
          pkg_cv_UUID_CFLAGS="$UUID_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
@@ -21,7 +21,7 @@ uuid_generate(3):
  else
    pkg_failed=yes
  fi
-@@ -17039,12 +17039,12 @@ if test -n "$PKG_CONFIG"; then
+@@ -17079,12 +17079,12 @@ if test -n "$PKG_CONFIG"; then
          pkg_cv_UUID_LIBS="$UUID_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
@@ -37,7 +37,7 @@ uuid_generate(3):
  else
    pkg_failed=yes
  fi
-@@ -17063,14 +17063,14 @@ else
+@@ -17103,14 +17103,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -55,7 +55,7 @@ uuid_generate(3):
  
  $UUID_PKG_ERRORS
  
-@@ -17328,7 +17328,7 @@ if test "${ac_cv_lib_id3_ID3Tag_New+set}" = set; then 
+@@ -17368,7 +17368,7 @@ if test "${ac_cv_lib_id3_ID3Tag_New+set}" = set; then 
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -64,7 +64,7 @@ uuid_generate(3):
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -17363,7 +17363,7 @@ if test "x$ac_cv_lib_id3_ID3Tag_New" = x""yes; then :
+@@ -17403,7 +17403,7 @@ if test "x$ac_cv_lib_id3_ID3Tag_New" = x""yes; then :
  #define HAVE_LIBID3 1
  _ACEOF
  
diff --git a/x11/gnome/tracker/patches/patch-src_libtracker-db_tracker-db-journal_c b/x11/gnome/tracker/patches/patch-src_libtracker-db_tracker-db-journal_c
index 8a52a3df632..4d0fb4e3a8b 100644
--- a/x11/gnome/tracker/patches/patch-src_libtracker-db_tracker-db-journal_c
+++ b/x11/gnome/tracker/patches/patch-src_libtracker-db_tracker-db-journal_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_libtracker-db_tracker-db-journal_c,v 1.2 2010/04/23 09:57:25 ajacoutot Exp $
---- src/libtracker-db/tracker-db-journal.c.orig	Thu Apr 22 12:24:04 2010
-+++ src/libtracker-db/tracker-db-journal.c	Fri Apr 23 10:04:21 2010
-@@ -796,6 +796,15 @@ tracker_db_journal_reader_verify_last (GError **error)
+$OpenBSD: patch-src_libtracker-db_tracker-db-journal_c,v 1.3 2010/05/07 07:22:47 ajacoutot Exp $
+--- src/libtracker-db/tracker-db-journal.c.orig	Thu May  6 14:27:57 2010
++++ src/libtracker-db/tracker-db-journal.c	Fri May  7 08:49:44 2010
+@@ -797,6 +797,15 @@ tracker_db_journal_reader_verify_last (GError **error)
  	return success;
  }
  
diff --git a/x11/gnome/tracker/pkg/MESSAGE b/x11/gnome/tracker/pkg/MESSAGE
deleted file mode 100644
index 4c06d72eecd..00000000000
--- a/x11/gnome/tracker/pkg/MESSAGE
+++ /dev/null
@@ -1,2 +0,0 @@
-To allow tracker to index more types of media files, it is advised to
-install the corresponding Gstreamer plugins.
diff --git a/x11/gnome/tracker/pkg/PLIST b/x11/gnome/tracker/pkg/PLIST
index f534b61d521..fcbbdbc5964 100644
--- a/x11/gnome/tracker/pkg/PLIST
+++ b/x11/gnome/tracker/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.13 2010/04/24 00:35:20 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.14 2010/05/07 07:22:47 ajacoutot Exp $
 @bin bin/tracker-control
 @bin bin/tracker-explorer
 @bin bin/tracker-import
@@ -264,6 +264,7 @@ share/tracker/tracker-status.xml
 share/tracker/tracker-writeback.xml
 share/tracker/tst.ui
 share/vala/vapi/tracker-client-0.8.vapi
+share/vala/vapi/tracker-miner-0.8.deps
 share/vala/vapi/tracker-miner-0.8.vapi
 @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor
 @unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor