diff --git a/nautilus-tracker-0.14.patch b/nautilus-tracker-0.14.patch
new file mode 100644
index 0000000..3096e40
--- /dev/null
+++ b/nautilus-tracker-0.14.patch
@@ -0,0 +1,31 @@
+commit 88f18618ba15b952a739e410b910508f244b1fc3
+Author: Vincent Untz <vuntz@gnome.org>
+Date:   Thu Jan 19 10:26:14 2012 +0100
+
+    build: Support build against tracker 0.13/0.14
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=667853
+
+diff --git a/configure.in b/configure.in
+index f89522a..a762e00 100644
+--- a/configure.in
++++ b/configure.in
+@@ -280,10 +280,14 @@ AC_ARG_ENABLE(tracker,
+ 
+ build_tracker=no
+ if test "x$enable_tracker" != "xno"; then
+-  PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12, [
+-                             build_tracker=yes
+-                             AC_DEFINE(ENABLE_TRACKER, 1, [Define to enable Tracker support])],
+-                             build_tracker=no)
++  PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.14,
++                    [build_tracker=yes],
++                    [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12,
++		                       [build_tracker=yes],
++                                       [build_tracker=no])])
++  if test "x$build_tracker" = "xyes"; then
++    AC_DEFINE(ENABLE_TRACKER, 1, [Define to enable Tracker support])
++  fi
+ fi
+ 
+ AM_CONDITIONAL(ENABLE_TRACKER, test "x$build_tracker" = "xyes")
diff --git a/nautilus.changes b/nautilus.changes
index 49ec35c..c5a9472 100644
--- a/nautilus.changes
+++ b/nautilus.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jan 19 09:15:03 UTC 2012 - vuntz@opensuse.org
+
+- Add support for tracker 0.13/0.14:
+  + Add nautilus-tracker-0.14.patch.
+  + Add call to gnome-autogen.sh, needed for above patch.
+  + Change pkgconfig(tracker-sparql-0.12) BuildRequires to
+    pkgconfig(tracker-sparql-0.14).
+
 -------------------------------------------------------------------
 Tue Jan 17 07:45:57 UTC 2012 - vuntz@opensuse.org
 
diff --git a/nautilus.spec b/nautilus.spec
index 948c9c6..6aa97f2 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 Name:           nautilus
 Version:        3.3.4
 Release:        0
@@ -29,6 +28,8 @@ Source1:        mount-archive.desktop
 Source99:       baselibs.conf
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+# PATCH-FIX-UPSTREAM nautilus-tracker-0.14.patch bgo#667853 vuntz@opensuse.org -- Support tracker 0.13/0.14
+Patch0:         nautilus-tracker-0.14.patch
 # PATCH-NEEDS-REBASE nautilus-drives-and-volumes-on-desktop.diff bnc335411 federico@novell.com
 Patch15:        nautilus-drives-and-volumes-on-desktop.diff
 # PATCH-NEEDS-REBASE nautilus-sysadmin-desktop-items.diff fate305252 federico@novell.com -- Support sysadmin-defined desktop items (was PATCH-FEATURE-OPENSUSE)
@@ -36,6 +37,7 @@ Patch21:        nautilus-sysadmin-desktop-items.diff
 # needed for directory ownership
 BuildRequires:  dbus-1
 BuildRequires:  fdupes
+# needed for patch0
 BuildRequires:  gnome-common
 BuildRequires:  gnome-icon-theme
 BuildRequires:  gnome-patch-translation
@@ -58,7 +60,7 @@ BuildRequires:  pkgconfig(libexif)
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(pango)
-BuildRequires:  pkgconfig(tracker-sparql-0.12)
+BuildRequires:  pkgconfig(tracker-sparql-0.14)
 # So that symlinks to icons work:
 Requires:       gnome-icon-theme
 Recommends:     %{name}-lang
@@ -106,13 +108,15 @@ This package contains development files for nautilus.
 %prep
 %setup -q
 translation-update-upstream
+%patch0 -p1
 #gnome-patch-translation-prepare
 ### %patch15 -p1
 #%patch21 -p1
 #gnome-patch-translation-update
 
 %build
-#NOCONFIGURE=1 gnome-autogen.sh
+# needed for patch0
+NOCONFIGURE=1 gnome-autogen.sh
 %configure\
 	--disable-update-mimedb \
 	--enable-gtk-doc