diff --git a/geocode-glib-3.24.0.tar.xz b/geocode-glib-3.24.0.tar.xz
deleted file mode 100644
index 985dd0e..0000000
--- a/geocode-glib-3.24.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e
-size 413536
diff --git a/geocode-glib-3.25.4.1.tar.xz b/geocode-glib-3.25.4.1.tar.xz
new file mode 100644
index 0000000..6979b0e
--- /dev/null
+++ b/geocode-glib-3.25.4.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f10169262c313dfaa21acf00687c01e0aaf52983524648e8b9e8e42c052dd778
+size 75852
diff --git a/geocode-glib.changes b/geocode-glib.changes
index 215afa4..e18c98c 100644
--- a/geocode-glib.changes
+++ b/geocode-glib.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Aug  9 13:25:41 UTC 2017 - zaitor@opensuse.org
+
+- Update to version 3.25.4.1:
+  + Brown paperbag release to add news entry for 3.25.4.
+- Changes from version 3.25.4:
+  + Port to meson build system.
+  + Drop autotools.
+  + Provide a configure script for backwards compatibility.
+  + Fix a warning from gcc 7.1.1.
+- Add meson BuildRequires and switch autotools macros configure,
+  make and makeinstall to meson, meson_build and meson_install
+  following upstream switch to Meson build system.
+- Replace gnome-doc-utils-devel with gtk-doc BuildRequires and pass
+  enable-gtk-doc=true to meson.
+- Pass enable-installed-tests=false to meson, unsure if we should
+  package these or not, default upstream is yes.
+
 -------------------------------------------------------------------
 Wed Aug  9 09:42:45 UTC 2017 - zaitor@opensuse.org
 
diff --git a/geocode-glib.spec b/geocode-glib.spec
index bb736f6..7da3cec 100644
--- a/geocode-glib.spec
+++ b/geocode-glib.spec
@@ -17,19 +17,20 @@
 
 
 Name:           geocode-glib
-Version:        3.24.0
+Version:        3.25.4.1
 Release:        0
 Summary:        Convenience library for the Yahoo! Place Finder APIs
 License:        LGPL-2.0+
 Group:          System/Libraries
 Url:            http://www.gnome.org/
-Source:         https://download.gnome.org/sources/geocode-glib/3.24/%{name}-%{version}.tar.xz
+Source:         https://download.gnome.org/sources/geocode-glib/3.25/%{name}-%{version}.tar.xz
 Source1:        baselibs.conf
-BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gobject-introspection-devel
+BuildRequires:  gtk-doc
 # Needed for post/postun scripts
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  intltool
+BuildRequires:  meson
 BuildRequires:  pkgconfig(gio-2.0) >= 2.34
 BuildRequires:  pkgconfig(json-glib-1.0) >= 0.99.2
 BuildRequires:  pkgconfig(libsoup-2.4) >= 2.42
@@ -94,22 +95,17 @@ geocode-glib library.
 %setup -q
 
 %build
-%configure
-make %{?_smp_mflags}
+# FIXME Please investigate if we should package installed-tests
+%meson \
+	-Denable-gtk-doc=true \
+	-Denable-installed-tests=false \
+	%{nil}
+%meson_build
 
 %install
-%make_install
+%meson_install
 find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
 
-%clean
-rm -rf %{buildroot}
-
-%post
-%icon_theme_cache_post gnome
-
-%postun
-%icon_theme_cache_postun gnome
-
 %post -n libgeocode-glib0 -p /sbin/ldconfig
 
 %postun -n libgeocode-glib0 -p /sbin/ldconfig
@@ -129,7 +125,7 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root)
-%doc %{_datadir}/gtk-doc/html/geocode-glib-1.0/
+%doc %{_datadir}/gtk-doc/html/geocode-glib/
 %{_datadir}/gir-1.0/*.gir
 %{_includedir}/geocode-glib-1.0/
 %{_libdir}/pkgconfig/geocode-glib-1.0.pc