diff --git a/.gitignore b/.gitignore
index ac2d1a6..67dc8f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@
 /gnome-software-3.24.1.tar.xz
 /gnome-software-3.24.2.tar.xz
 /gnome-software-3.24.3.tar.xz
+/gnome-software-3.25.3.tar.xz
diff --git a/gnome-software.spec b/gnome-software.spec
index ea0f960..09ec903 100644
--- a/gnome-software.spec
+++ b/gnome-software.spec
@@ -2,24 +2,24 @@
 %global gtk3_version 3.22.4
 %global json_glib_version 1.1.1
 %global packagekit_version 1.1.1
-%global appstream_glib_version 0.6.9
+%global appstream_glib_version 0.7.0
 %global libsoup_version 2.51.92
 %global gsettings_desktop_schemas_version 3.11.5
 %global gnome_desktop_version 3.17.92
-%global fwupd_version 0.7.3
+%global fwupd_version 0.9.3
 %global flatpak_version 0.8.0
 
 # this should be set using "--without packagekit" when atomic
 %bcond_without packagekit
 
 Name:      gnome-software
-Version:   3.24.3
+Version:   3.25.3
 Release:   1%{?dist}
 Summary:   A software center for GNOME
 
 License:   GPLv2+
 URL:       https://wiki.gnome.org/Apps/Software
-Source0:   https://download.gnome.org/sources/gnome-software/3.24/%{name}-%{version}.tar.xz
+Source0:   https://download.gnome.org/sources/gnome-software/3.25/%{name}-%{version}.tar.xz
 
 BuildRequires: gettext
 BuildRequires: libxslt
@@ -34,6 +34,7 @@ BuildRequires: gtkspell3-devel
 BuildRequires: json-glib-devel >= %{json_glib_version}
 BuildRequires: libappstream-glib-devel >= %{appstream_glib_version}
 BuildRequires: libsoup-devel
+BuildRequires: meson
 %if %{with packagekit}
 BuildRequires: PackageKit-glib-devel >= %{packagekit_version}
 %endif
@@ -81,27 +82,31 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 These development files are for building gnome-software plugins outside
 the source tree. Most users do not need this subpackage installed.
 
+%package editor
+Summary: Banner designer for GNOME Software
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description editor
+Editor for designing banners for GNOME Software.
+
 %prep
 %autosetup -p1
 
 %build
-%configure \
-    --disable-static \
-    --enable-gudev \
+%meson \
+    -Denable-gudev=true \
 %if %{with packagekit}
-    --enable-packagekit \
+    -Denable-packagekit=true \
 %else
-    --disable-packagekit \
+    -Denable-packagekit=false \
 %endif
-    --disable-external-appstream \
-    --disable-tests \
-    --disable-silent-rules
-make %{?_smp_mflags}
+    -Denable-external-appstream=false \
+    -Denable-tests=false \
+    -Denable-ubuntu-reviews=false
+%meson_build
 
 %install
-%make_install
-
-rm %{buildroot}%{_libdir}/gs-plugins-%{gs_plugin_version}/*.la
+%meson_install
 
 # make the software center load faster
 desktop-file-edit %{buildroot}%{_datadir}/applications/org.gnome.Software.desktop \
@@ -133,22 +138,23 @@ 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
+%doc AUTHORS README
 %license COPYING
 %{_bindir}/gnome-software
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/gnome-software-local-file.desktop
+%{_datadir}/applications/org.gnome.Software.desktop
 %dir %{_datadir}/gnome-software
 %{_datadir}/gnome-software/*.png
-%{_datadir}/appdata/*.appdata.xml
 %{_mandir}/man1/gnome-software.1.gz
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/gnome-software/featured-*.svg
 %{_datadir}/gnome-software/featured-*.jpg
-%{_datadir}/appdata/org.gnome.Software.Plugin.Epiphany.metainfo.xml
-%{_datadir}/appdata/org.gnome.Software.Plugin.Flatpak.metainfo.xml
-%{_datadir}/appdata/org.gnome.Software.Plugin.Fwupd.metainfo.xml
-%{_datadir}/appdata/org.gnome.Software.Plugin.Odrs.metainfo.xml
-%{_datadir}/appdata/org.gnome.Software.Plugin.Steam.metainfo.xml
+%{_datadir}/metainfo/org.gnome.Software.appdata.xml
+%{_datadir}/metainfo/org.gnome.Software.Plugin.Epiphany.metainfo.xml
+%{_datadir}/metainfo/org.gnome.Software.Plugin.Flatpak.metainfo.xml
+%{_datadir}/metainfo/org.gnome.Software.Plugin.Fwupd.metainfo.xml
+%{_datadir}/metainfo/org.gnome.Software.Plugin.Odrs.metainfo.xml
+%{_datadir}/metainfo/org.gnome.Software.Plugin.Steam.metainfo.xml
 %dir %{_libdir}/gs-plugins-%{gs_plugin_version}
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_appstream.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_desktop-categories.so
@@ -156,7 +162,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_dpkg.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_dummy.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_epiphany.so
-%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-distro-upgrades.so
+%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-pkgdb-collections.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-tagger-usage.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_flatpak.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fwupd.so
@@ -165,15 +171,16 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-featured.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-popular.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_icons.so
+%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_key-colors-metadata.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_key-colors.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_modalias.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_odrs.so
+%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_os-release.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_ostree.so
 %if %{with packagekit}
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-history.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-local.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-offline.so
-%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-origin.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-proxy.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-refine.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-refresh.so
@@ -183,6 +190,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_provenance-license.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_provenance.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_repos.so
+%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_rewrite-resource.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_rpm.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_shell-extensions.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_steam.so
@@ -207,7 +215,18 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_includedir}/gnome-software/*.h
 %{_datadir}/gtk-doc/html/gnome-software
 
+%files editor
+%{_bindir}/gnome-software-editor
+%{_datadir}/app-info/xmls/org.gnome.Software.Featured.xml
+%{_datadir}/applications/org.gnome.Software.Editor.desktop
+%{_mandir}/man1/gnome-software-editor.1*
+
 %changelog
+* Fri Jun 23 2017 Kalev Lember <klember@redhat.com> - 3.25.3-1
+- Update to 3.25.3
+- Switch to the meson build system
+- Add an -editor subpackage with new banner editor
+
 * Mon May 15 2017 Richard Hughes <rhughes@redhat.com> - 3.24.3-1
 - Update to 3.23.3
 - Fix a common crash when installing flatpakrepo files
diff --git a/sources b/sources
index 666aa8c..a0d1c65 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-software-3.24.3.tar.xz) = 9f5b604fa78528ab9ad9f1a1ede2fd534b98cb17fd62b82c40c6ddeddb911283f41f409771dc558a0cd98a9399688667930a618a0f21974e2d2b18271dc5d673
+SHA512 (gnome-software-3.25.3.tar.xz) = ab68a9aaac51d2b70732de6fb75d21d1917aa325f816fe63b5b3af892d80be7a25452333f95d5e5e33616424d073a506f9db32c7a1d11a88b235700ce6fc868d