diff --git a/.gitignore b/.gitignore
index 28a3e48..1095904 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,4 @@ totem-2.90.5.tar.bz2
 /totem-3.22.0.tar.xz
 /totem-3.23.90.tar.xz
 /totem-3.24.0.tar.xz
+/totem-3.25.90.1.tar.xz
diff --git a/0001-lirc-Fix-lirc-plugin-dependency-checks.patch b/0001-lirc-Fix-lirc-plugin-dependency-checks.patch
new file mode 100644
index 0000000..17b913e
--- /dev/null
+++ b/0001-lirc-Fix-lirc-plugin-dependency-checks.patch
@@ -0,0 +1,32 @@
+From 09de336619ec177e6943fcc2cb2817f1b4366ea8 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Mon, 14 Aug 2017 10:40:46 +0200
+Subject: [PATCH] lirc: Fix lirc plugin dependency checks
+
+The pkg-config file is called lirc, not lirc_client (the name of the
+library), and the function check didn't link against liblirc_client
+either.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=786258
+---
+ src/plugins/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/meson.build b/src/plugins/meson.build
+index 83d76d86..95af6485 100644
+--- a/src/plugins/meson.build
++++ b/src/plugins/meson.build
+@@ -70,8 +70,8 @@ if plugins_option != 'none'
+     message(str)
+   endif
+ 
+-  lirc_dep = dependency('lirc_client', required: false)
+-  if lirc_dep.found() and cc.has_function('lirc_init') and cc.has_header('lirc/lirc_client.h')
++  lirc_dep = dependency('lirc', required: false)
++  if lirc_dep.found() and cc.has_function('lirc_init', dependencies: lirc_dep) and cc.has_header('lirc/lirc_client.h')
+     plugins += 'lirc'
+   else
+     str = 'you need lirc_client installed for the lirc plugin'
+-- 
+2.13.0
+
diff --git a/sources b/sources
index 0513e47..6e8691d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (totem-3.24.0.tar.xz) = 488db91e09b7f5947e81cb5474444c753367542820777faab561582707b012e664f232d3810d543dfbe0823adf3d8302c2fe6cc387f4225a362d15a6df8b4342
+SHA512 (totem-3.25.90.1.tar.xz) = 1cc178c55a98933f2c45e10cd5ced166f360eb950f6fd38ef1a9de0a40b5d59e3aaa2a24d14e057867b28ddb25a1d0bc91b232dced07170d63e59ce4a6a244fc
diff --git a/totem.spec b/totem.spec
index 1f3df77..0a57045 100644
--- a/totem.spec
+++ b/totem.spec
@@ -5,14 +5,17 @@
 %global gtk3_version 3.19.4
 
 Name: totem
-Version: 3.24.0
-Release: 5%{?dist}
+Version: 3.25.90.1
+Release: 1%{?dist}
 Epoch: 1
 Summary: Movie player for GNOME
 
 License: GPLv2+ with exceptions
 URL: https://wiki.gnome.org/Apps/Videos
-Source0: https://download.gnome.org/sources/%{name}/3.24/%{name}-%{version}.tar.xz
+Source0: https://download.gnome.org/sources/%{name}/3.25/%{name}-%{version}.tar.xz
+
+# Backported from upstream
+Patch0: 0001-lirc-Fix-lirc-plugin-dependency-checks.patch
 
 BuildRequires: pkgconfig(cairo)
 BuildRequires: pkgconfig(clutter-1.0)
@@ -33,9 +36,12 @@ BuildRequires: pkgconfig(totem-plparser)
 # Needed for the videoscale element.
 BuildRequires: gstreamer1-plugins-good
 
-BuildRequires: gcc-c++, gettext
+BuildRequires: gcc-c++
+BuildRequires: gettext
+BuildRequires: gtk-doc
 BuildRequires: intltool
 BuildRequires: itstool
+BuildRequires: meson
 %if 0%{?fedora}
 BuildRequires: pylint
 %endif
@@ -136,29 +142,20 @@ This package provides a Nautilus extension that shows the properties of
 audio and video files in the properties dialog.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
-export PYTHON=%{__python3}
-%configure \
-  --enable-nautilus \
-  --disable-static
-
-make %{?_smp_mflags}
+%meson -Denable-gtk-doc=true
+%meson_build
 
 %install
-%make_install
+%meson_install
 %find_lang %{name} --with-gnome
 
-#nuke the .la file(s)
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-
-
 %check
 appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/appdata/*.appdata.xml
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/org.gnome.Totem.desktop
 
-
 %post
 /sbin/ldconfig
 update-desktop-database &> /dev/null || :
@@ -177,13 +174,11 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
-
 %files -f %{name}.lang
 %doc AUTHORS NEWS README TODO
 %license COPYING
 %{_bindir}/%{name}
 %{_bindir}/%{name}-video-thumbnailer
-%{_bindir}/%{name}-audio-preview
 %{_libdir}/libtotem.so.*
 %{_libdir}/girepository-1.0/Totem-1.0.typelib
 %{_datadir}/appdata/org.gnome.Totem.appdata.xml
@@ -218,10 +213,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libdir}/totem/plugins/save-file
 %{_libdir}/totem/plugins/variable-rate
 %{_libdir}/totem/plugins/vimeo
+%{_libexecdir}/totem-gallery-thumbnailer
 %{_datadir}/icons/hicolor/*/apps/org.gnome.Totem.png
 %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Totem-symbolic.svg
 %{_mandir}/man1/%{name}.1*
-%{_mandir}/man1/totem-audio-preview.1*
 %{_mandir}/man1/totem-video-thumbnailer.1*
 %{_datadir}/GConf/gsettings/*.convert
 %{_datadir}/glib-2.0/schemas/*.xml
@@ -243,6 +238,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gir-1.0/Totem-1.0.gir
 
 %changelog
+* Wed Aug 16 2017 Kalev Lember <klember@redhat.com> - 1:3.25.90.1-1
+- Update to 3.25.90.1
+- Switch to the meson build system
+
 * Thu Aug 10 2017 Kalev Lember <klember@redhat.com> - 1:3.24.0-5
 - Rebuilt for libtotem-plparser soname bump