diff --git a/geoclue.spec b/geoclue.spec
index 4eb0c4b..9d9c56a 100644
--- a/geoclue.spec
+++ b/geoclue.spec
@@ -1,6 +1,6 @@
 %define majver %(echo %version | cut -d. -f1-2)
 Name:          geoclue
-Version:       2.4.4
+Version:       2.5.3
 Release:       1mamba
 Summary:       A modular geoinformation service
 Group:         System/Libraries
@@ -8,7 +8,8 @@ Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://www.freedesktop.org/wiki/Software/GeoClue
-Source0:       http://www.freedesktop.org/software/geoclue/releases/%{majver}/geoclue-%{version}.tar.xz
+Source0:       https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/%{version}/geoclue-%{version}.tar.bz2
+#Source0:       http://www.freedesktop.org/software/geoclue/releases/%{majver}/geoclue-%{version}.tar.xz
 Patch0:        libgeoclue-0.11.1.1-nm08.patch
 Patch1:        libgeoclue-0.12.0-NMCrash.patch
 Patch2:        libgeoclue-0.12.0-gcc-4.7.patch
@@ -41,12 +42,23 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 %description
 Geoclue is a modular geoinformation service built on top of the D-Bus messaging system. The goal of the Geoclue project is to make creating location-aware applications as simple as possible.
 
-%package devel
-Group:         Development/Libraries
-Summary:       Libraries and headers for %{name}
+%package -n lib%{name}
+Group:         System/Libraries
+Summary:       Shared librarires for %{name}
 Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 
-%description devel
+%description  -n lib%{name}
+Geoclue is a modular geoinformation service built on top of the D-Bus messaging system. The goal of the Geoclue project is to make creating location-aware applications as simple as possible.
+This package contains  the shared libraries.
+
+%package -n lib%{name}-devel
+Group:         Development/Libraries
+Summary:       Libraries and headers for %{name}
+Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
+Provides:      geoclue-devel
+Obsoletes:     geoclue-devel
+
+%description -n lib%{name}-devel
 Geoclue is a modular geoinformation service built on top of the D-Bus messaging system. The goal of the Geoclue project is to make creating location-aware applications as simple as possible.
 This package contains libraries and header files needed for development.
 
@@ -63,48 +75,65 @@ This package includes the %{name} API documentation.
 %setup -q -n geoclue-%{version}
 
 %build
-%configure \
-    --enable-gtk-doc
+%meson \
+   -Dgtk_doc=true
 
-%make
+%meson_build
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%makeinstall
+%meson_install
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%preun
+%systemd_preun geoclue
+:
+
+%post
+%systemd_post geoclue
+:
+
+%postun
+%systemd_postun_with_restart geoclue
+:
+
+%post -n lib%{name} -p /sbin/ldconfig
+%postun -n lib%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
+%{_sysconfdir}/xdg/autostart/geoclue-demo-agent.desktop
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.GeoClue2.conf
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.GeoClue2.Agent.conf
 %config(noreplace) %{_sysconfdir}/geoclue/geoclue.conf
-%{_libdir}/libgeoclue-2.so.*
-%{_libdir}/girepository-1.0/Geoclue-2.0.typelib
-/lib/systemd/system/geoclue.service
-%{_libexecdir}/geoclue
-%dir %{_libexecdir}/geoclue-2.0
-%dir %{_libexecdir}/geoclue-2.0/demos
-%{_libexecdir}/geoclue-2.0/demos/where-am-i
+%{_unitdir}/geoclue.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.GeoClue2.service
 %{_datadir}/dbus-1/interfaces/org.freedesktop.GeoClue2*.xml
 %{_datadir}/applications/geoclue-demo-agent.desktop
 %{_datadir}/applications/geoclue-where-am-i.desktop
+%{_mandir}/man5/geoclue.5*
 
-%files devel
+%files -n lib%{name}
+%defattr(-,root,root)
+%{_libdir}/libgeoclue-2.so.*
+%{_libdir}/girepository-1.0/Geoclue-2.0.typelib
+%{_libexecdir}/geoclue
+%dir %{_libexecdir}/geoclue-2.0
+%dir %{_libexecdir}/geoclue-2.0/demos
+%{_libexecdir}/geoclue-2.0/demos/*
+
+%files -n lib%{name}-devel
 %defattr(-,root,root)
 %dir %{_includedir}/libgeoclue-2.0
 %{_includedir}/libgeoclue-2.0/*
-%{_libdir}/libgeoclue-2.la
 %{_libdir}/libgeoclue-2.so
 %{_libdir}/pkgconfig/libgeoclue-2.0.pc
 %{_libdir}/pkgconfig/geoclue-2.0.pc
+%{_datadir}/vala/vapi/libgeoclue-2.0.deps
+%{_datadir}/vala/vapi/libgeoclue-2.0.vapi
 %{_datadir}/gir-1.0/Geoclue-2.0.gir
-%doc README
 
 %files apidocs
 %defattr(-,root,root)
@@ -114,6 +143,9 @@ This package includes the %{name} API documentation.
 %{_datadir}/gtk-doc/html/libgeoclue/*
 
 %changelog
+* Thu Aug 15 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 2.5.3-1mamba
+- update to 2.5.3
+
 * Sat Sep 17 2016 Automatic Build System <autodist@mambasoft.it> 2.4.4-1mamba
 - automatic update by autodist