diff --git a/.geoclue2.metadata b/.geoclue2.metadata
index 0f18247..6ff2400 100644
--- a/.geoclue2.metadata
+++ b/.geoclue2.metadata
@@ -1 +1 @@
-5333aa79c920458f082398f345e623e4d455b1a8 SOURCES/geoclue-2.4.10.tar.xz
+5710bbd39139c1de7368d2193b3f50788ff93e4d SOURCES/geoclue-2.5.5.tar.bz2
diff --git a/.gitignore b/.gitignore
index c99a68e..df5015d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/geoclue-2.4.10.tar.xz
+SOURCES/geoclue-2.5.5.tar.bz2
diff --git a/SPECS/geoclue2.spec b/SPECS/geoclue2.spec
index 18e3af9..24a0913 100644
--- a/SPECS/geoclue2.spec
+++ b/SPECS/geoclue2.spec
@@ -1,21 +1,23 @@
 Name:           geoclue2
-Version:        2.4.10
+Version:        2.5.5
 Release:        1%{?dist}
 Summary:        Geolocation service
 
 License:        GPLv2+
 URL:            http://www.freedesktop.org/wiki/Software/GeoClue/
-Source0:        http://www.freedesktop.org/software/geoclue/releases/2.4/geoclue-%{version}.tar.xz
+Source0:        https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/%{version}/geoclue-%{version}.tar.bz2
 
 BuildRequires:  avahi-glib-devel
+BuildRequires:  gettext
 BuildRequires:  glib2-devel
 BuildRequires:  gobject-introspection-devel
-BuildRequires:  intltool
-BuildRequires:  itstool
+BuildRequires:  gtk-doc
 BuildRequires:  json-glib-devel
 BuildRequires:  libsoup-devel
+BuildRequires:  meson
 BuildRequires:  ModemManager-glib-devel
 BuildRequires:  systemd
+BuildRequires:  vala
 Requires(pre):  shadow-utils
 Requires(post): systemd
 Requires(preun): systemd
@@ -71,15 +73,11 @@ The %{name}-demos package contains demo applications that use %{name}.
 
 
 %build
-%configure --with-dbus-service-user=geoclue --enable-demo-agent
-make %{?_smp_mflags} V=1
-
+%meson -Ddbus-srv-user=geoclue
+%meson_build
 
 %install
-%make_install
-
-find $RPM_BUILD_ROOT -name '*.la' -delete
-
+%meson_install
 # Home directory for the 'geoclue' user
 mkdir -p $RPM_BUILD_ROOT/var/lib/geoclue
 
@@ -104,8 +102,6 @@ exit 0
 %postun
 %systemd_postun_with_restart geoclue.service
 
-%ldconfig_scriptlets libs
-
 
 %files
 %license COPYING
@@ -119,18 +115,28 @@ exit 0
 %{_libexecdir}/geoclue
 %{_datadir}/dbus-1/system-services/org.freedesktop.GeoClue2.service
 %{_datadir}/applications/geoclue-demo-agent.desktop
+%{_mandir}/man5/geoclue.5*
 %{_unitdir}/geoclue.service
 %{_libexecdir}/geoclue-2.0/demos/agent
 %attr(755,geoclue,geoclue) %dir /var/lib/geoclue
 
 %files libs
 %license COPYING.LIB
+%dir %{_libdir}/girepository-1.0
 %{_libdir}/girepository-1.0/Geoclue-2.0.typelib
 %{_libdir}/libgeoclue-2.so.0*
 
 %files devel
 %{_datadir}/dbus-1/interfaces/org.freedesktop.GeoClue2*.xml
+%dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/Geoclue-2.0.gir
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/geoclue/
+%{_datadir}/gtk-doc/html/libgeoclue/
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
+%{_datadir}/vala/vapi/libgeoclue-2.0.*
 %{_includedir}/libgeoclue-2.0/
 %{_libdir}/pkgconfig/geoclue-2.0.pc
 %{_libdir}/pkgconfig/libgeoclue-2.0.pc
@@ -141,6 +147,9 @@ exit 0
 %{_datadir}/applications/geoclue-where-am-i.desktop
 
 %changelog
+* Wed Oct 09 2019 David King <dking@redhat.com> - 2.5.5-1
+- Rebase to 2.5.5 (#1748329)
+
 * Thu May 03 2018 Bastien Nocera <bnocera@redhat.com> - 2.4.10-1
 + geoclue2-2.4.10-1
 - Update to 2.4.10