diff --git a/tracker-2.0.3.tar.xz b/tracker-2.0.3.tar.xz
deleted file mode 100644
index fe52ebd..0000000
--- a/tracker-2.0.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5a2fb274c128ec67a920944937b5147ceaf5db16fef6691ea22c4cb841e20580
-size 2616904
diff --git a/tracker-2.0.4.tar.xz b/tracker-2.0.4.tar.xz
new file mode 100644
index 0000000..f123e5d
--- /dev/null
+++ b/tracker-2.0.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ce2f0db52666592d313a04ce14663110eafa8ab08dc213b53e790281362dccd5
+size 2607728
diff --git a/tracker.changes b/tracker.changes
index 9d4f844..3e04ac6 100644
--- a/tracker.changes
+++ b/tracker.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Jun 26 02:56:27 UTC 2018 - luc14n0@linuxmail.org
+
+- Update to version 2.0.4:
+  + libtracker-miner:
+    - Fix event emission order of the root folder when a recursive
+      directory is found through monitor events.
+    - Improvements to attribute-only update handling.
+  + libtracker-data: Perform VACUUM only past a database file size
+    limit.
+- Drop:
+  + update-desktop-files BuildRequires and suse_update_desktop_file
+    macro: they are no longer needed.
+  + glib2_gsettings_schema_requires macro: it is not required
+    anymore since RPM file triggers (version 4.13).
+
 -------------------------------------------------------------------
 Tue Apr 17 09:40:09 UTC 2018 - bjorn.lie@gmail.com
 
diff --git a/tracker.spec b/tracker.spec
index f2d7a3e..1c92f94 100644
--- a/tracker.spec
+++ b/tracker.spec
@@ -19,8 +19,10 @@
 
 %define TrackerAPI    2.0
 %define RPMTrackerAPI 2_0
+# FIXME: At every release switch on meson use and try to fix it, if the build succeeds remove this conditional.
+%bcond_with meson
 Name:           tracker
-Version:        2.0.3
+Version:        2.0.4
 Release:        0
 Summary:        Object database, tag/metadata database, search tool and indexer
 License:        GPL-2.0-or-later
@@ -39,9 +41,8 @@ BuildRequires:  libicu-devel >= 4.8.1.1
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  python3
-BuildRequires:  sqlite3-devel >= 3.7.15
+BuildRequires:  sqlite3-devel >= 3.8.3
 BuildRequires:  translation-update-upstream
-BuildRequires:  update-desktop-files
 BuildRequires:  vala >= 0.18.0
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
@@ -64,7 +65,10 @@ Obsoletes:      tracker-gui < 1.99.0
 Obsoletes:      tracker-miner-evolution < 1.99.0
 Obsoletes:      tracker-miner-firefox < 1.99.0
 Obsoletes:      tracker-miner-thunderbird < 1.99.0
-%glib2_gsettings_schema_requires
+%if %{with meson}
+BuildRequires:  meson
+BuildRequires:  pkgconfig(dbus-1)
+%endif
 %if 0%{?suse_version} >= 1140
 BuildRequires:  libgupnp-dlna-devel >= 0.9.4
 %endif
@@ -218,6 +222,10 @@ This subpackage contains the headers to make use of its libraries.
 translation-update-upstream
 
 %build
+%if %{with meson}
+%meson
+%meson_build
+%else
 #Needed for patch0
 autoreconf -fiv
 %configure \
@@ -225,13 +233,15 @@ autoreconf -fiv
 	--disable-functional-tests \
 	%{nil}
 %make_build
+%endif
 
 %install
+%if %{with meson}
+%meson_install
+%else
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
-
-## Normal build
-%suse_update_desktop_file tracker-store
+%endif
 %find_lang %{name} %{?no_lang_C}
 
 # Ensure we have a /usr/share/tracker/icons/ folder, so the
@@ -239,6 +249,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 mkdir -p %{buildroot}%{_datadir}/tracker/icons/
 
 %fdupes %{buildroot}%{_datadir}/vala/
+%fdupes %{buildroot}%{_datadir}/gtk-doc
 
 %post -n libtracker-control-%{RPMTrackerAPI}-0 -p /sbin/ldconfig
 %postun -n libtracker-control-%{RPMTrackerAPI}-0 -p /sbin/ldconfig