diff --git a/.gitignore b/.gitignore
index 738ee21..375f9cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /libmediaart-1.9.2.tar.xz
 /libmediaart-1.9.3.tar.xz
 /libmediaart-1.9.4.tar.xz
+/libmediaart-1.9.5.tar.xz
diff --git a/libmediaart.spec b/libmediaart.spec
index da92569..496eb13 100644
--- a/libmediaart.spec
+++ b/libmediaart.spec
@@ -1,13 +1,14 @@
 Name:           libmediaart
-Version:        1.9.4
-Release:        11%{?dist}
+Version:        1.9.5
+Release:        1%{?dist}
 Summary:        Library for managing media art caches
 
 License:        LGPLv2+
 URL:            https://gitlab.gnome.org/GNOME/libmediaart
 Source0:        https://download.gnome.org/sources/%{name}/1.9/%{name}-%{version}.tar.xz
 
-BuildRequires: make
+BuildRequires:  gtk-doc
+BuildRequires:  meson
 BuildRequires:  pkgconfig(glib-2.0) pkgconfig(gio-2.0) pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
@@ -17,6 +18,9 @@ BuildRequires:  gdk-pixbuf2-modules
 %endif
 BuildRequires:  vala vala-devel
 
+# Removed in F34
+Obsoletes: libmediaart-tests < 1.9.5
+
 %description
 Library tasked with managing, extracting and handling media art caches.
 
@@ -29,39 +33,29 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-%package  tests
-Summary:  Tests for the %{name} package
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description tests
-The %{name}-tests package contains tests that can be used to verify
-the functionality of the installed %{name} package.
 
 %prep
 %setup -q
 
 
 %build
-%configure --disable-static \
-  --enable-gdkpixbuf \
-  --disable-qt \
-  --enable-installed-tests
-make %{?_smp_mflags}
+%meson -Dimage_library=gdk-pixbuf -Dgtk_doc=true
+%meson_build
 
 
 %install
-%make_install
-find $RPM_BUILD_ROOT -name '*.la' -delete -print
+%meson_install
+
 
 %check
-make check
+%meson_test
 
 %ldconfig_scriptlets
 
 
 %files
 %license COPYING.LESSER
-%doc AUTHORS NEWS
+%doc NEWS
 %{_libdir}/libmediaart-2.0.so.*
 %{_libdir}/girepository-1.0/MediaArt-2.0.typelib
 
@@ -71,14 +65,16 @@ make check
 %{_libdir}/pkgconfig/libmediaart-2.0.pc
 %{_datadir}/gir-1.0/MediaArt-2.0.gir
 %{_datadir}/gtk-doc/html/libmediaart
+%{_datadir}/vala/vapi/libmediaart-2.0.deps
 %{_datadir}/vala/vapi/libmediaart-2.0.vapi
 
-%files tests
-%{_libexecdir}/installed-tests/libmediaart
-%{_datadir}/installed-tests
-
 
 %changelog
+* Wed May 26 2021 Kalev Lember <klember@redhat.com> - 1.9.5-1
+- Update to 1.9.5
+- Switch to meson build system
+- Drop installed tests subpackage as they are gone from upstream
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index c7b6d2b..597f6d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libmediaart-1.9.4.tar.xz) = e2526c22cb656c821da626c43c09d72afded1dfc369e77baea3de17dd6d3bd3b829cf3160e386459f55b9580cbeeb1d621c85876cb62739bc8d4f42429bdce1c
+SHA512 (libmediaart-1.9.5.tar.xz) = b1d54f4b480cb5cf63a2231b082635268ac1ab708ba829a3e5ccfdfb530e9d463c5ac505cd1dc44643f23f787c4df2ef287a7e68d56e93a05b97be450c7799b6