diff --git a/0001-build-Use-grilo-0.3-for-GNOME-3.20.patch b/0001-build-Use-grilo-0.3-for-GNOME-3.20.patch
new file mode 100644
index 0000000..06c2727
--- /dev/null
+++ b/0001-build-Use-grilo-0.3-for-GNOME-3.20.patch
@@ -0,0 +1,59 @@
+From b5d91d28673c4633f369daa576761cfe0c0ee92b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 2 Dec 2015 11:20:31 +0100
+Subject: [PATCH] build: Use grilo 0.3 for GNOME 3.20
+
+https://bugzilla.gnome.org/show_bug.cgi?id=758942
+---
+ configure.ac        |  4 ++--
+ gnomemusic/grilo.py | 10 +++++-----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8c34b8..654e4a6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,8 +37,8 @@ PKG_CHECK_MODULES(MEDIAART, [libmediaart-2.0])
+ GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
+ AC_SUBST(GLIB_COMPILE_RESOURCES)
+ 
+-GRL_MIN_VERSION=0.2.6
+-PKG_CHECK_MODULES(GRL, grilo-0.2 >= $GRL_MIN_VERSION)
++GRL_MIN_VERSION=0.3.0
++PKG_CHECK_MODULES(GRL, grilo-0.3 >= $GRL_MIN_VERSION)
+ 
+ AC_CONFIG_FILES([
+   Makefile
+diff --git a/gnomemusic/grilo.py b/gnomemusic/grilo.py
+index a810628..7943150 100644
+--- a/gnomemusic/grilo.py
++++ b/gnomemusic/grilo.py
+@@ -26,7 +26,7 @@
+ # delete this exception statement from your version.
+ 
+ import gi
+-gi.require_version('Grl', '0.2')
++gi.require_version('Grl', '0.3')
+ from gi.repository import GLib, GObject
+ from gnomemusic.query import Query
+ from gnomemusic import log, TrackerWrapper
+@@ -73,12 +73,12 @@ class Grilo(GObject.GObject):
+         if not (GLib.file_test(self.playlist_path, GLib.FileTest.IS_DIR)):
+             GLib.mkdir_with_parents(self.playlist_path, int("0755", 8))
+         self.options = Grl.OperationOptions()
+-        self.options.set_flags(Grl.ResolutionFlags.FAST_ONLY |
+-                               Grl.ResolutionFlags.IDLE_RELAY)
++        self.options.set_resolution_flags(Grl.ResolutionFlags.FAST_ONLY |
++                                          Grl.ResolutionFlags.IDLE_RELAY)
+ 
+         self.full_options = Grl.OperationOptions()
+-        self.full_options.set_flags(Grl.ResolutionFlags.FULL |
+-                                    Grl.ResolutionFlags.IDLE_RELAY)
++        self.full_options.set_resolution_flags(Grl.ResolutionFlags.FULL |
++                                               Grl.ResolutionFlags.IDLE_RELAY)
+ 
+         self.sources = {}
+         self.blacklist = ['grl-filesystem', 'grl-bookmarks', 'grl-metadata-store', 'grl-podcasts']
+-- 
+2.5.0
+
diff --git a/gnome-music.spec b/gnome-music.spec
index d478cea..905e29c 100644
--- a/gnome-music.spec
+++ b/gnome-music.spec
@@ -1,11 +1,11 @@
 %global gobject_introspection_version 1.35.9
-%global grilo_version 0.2.6
+%global grilo_version 0.3.0
 %global gtk3_version 3.13.2
 
 Name:          gnome-music
 Summary:       Music player and management application for GNOME
 Version:       3.18.2
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 # The sources are under the GPLv2+ license, except for:
 # - the bundled libgd which is LGPLv2+,
@@ -15,6 +15,8 @@ Release:       1%{?dist}
 License:       (GPLv2+ with exceptions) and LGPLv2+ and CC-BY-SA
 URL:           http://wiki.gnome.org/Apps/Music
 Source0:       https://download.gnome.org/sources/%{name}/3.18/%{name}-%{version}.tar.xz
+# Backported from upstream
+Patch0:        0001-build-Use-grilo-0.3-for-GNOME-3.20.patch
 
 BuildRequires: /usr/bin/appstream-util
 BuildRequires: desktop-file-utils
@@ -22,10 +24,13 @@ BuildRequires: intltool
 BuildRequires: itstool
 BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(gobject-introspection-1.0) >= %{gobject_introspection_version}
-BuildRequires: pkgconfig(grilo-0.2) >= %{grilo_version}
+BuildRequires: pkgconfig(grilo-0.3) >= %{grilo_version}
 BuildRequires: pkgconfig(libmediaart-2.0)
 BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
 BuildRequires: python3-devel
+# For patch0
+BuildRequires: autoconf automake libtool
+BuildRequires: yelp-tools
 
 Requires:      gdk-pixbuf2
 Requires:      gobject-introspection >= %{gobject_introspection_version}
@@ -56,9 +61,13 @@ Music player and management application for GNOME.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
+# For patch0
+autoreconf -fi
+
 %configure --disable-silent-rules
 make %{?_smp_mflags}
 
@@ -111,6 +120,9 @@ fi
 
 
 %changelog
+* Fri Dec 18 2015 Kalev Lember <klember@redhat.com> - 3.18.2-2
+- Build with grilo 0.3
+
 * Mon Nov 16 2015 Kalev Lember <klember@redhat.com> - 3.18.2-1
 - Update to 3.18.2