diff --git a/.gitignore b/.gitignore
index f838b72..f516fac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/bamf-0.5.0.tar.gz
-/bamf-0.5.1.tar.gz
+/bamf-0.5.3.tar.gz
diff --git a/bamf.spec b/bamf.spec
index 2fef16f..2ba24a1 100644
--- a/bamf.spec
+++ b/bamf.spec
@@ -1,7 +1,7 @@
 Summary:        Application matching framework
 Name:           bamf
-Version:        0.5.1
-Release:        2%{?dist}
+Version:        0.5.3
+Release:        1%{?dist}
 # Library bits are LGPLv2 or LGPLv3 (but not open-ended LGPLv2+);
 # non-lib bits are GPLv3.
 # pbrobinson points out that three files in the lib are actually
@@ -25,6 +25,7 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libgtop-2.0)
 BuildRequires:  pkgconfig(libwnck-3.0)
 BuildRequires:  pkgconfig(x11)
+BuildRequires:  systemd
 
 # there is no longer a separate GTK3 build
 Provides:       %{name}3%{?_isa} = %{version}-%{release}
@@ -57,6 +58,7 @@ Summary:        Application matching framework
 Group:          System Environment/Libraries
 License:        GPLv3
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+%{?systemd_requires}
 
 %description    daemon
 BAMF removes the headache of applications matching into a simple DBus
@@ -66,9 +68,11 @@ package contains the bamf daemon and supporting data.
 
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
+CFLAGS="$RPM_OPT_FLAGS -Wno-error=deprecated-declarations"
+export CFLAGS
 %configure --disable-static --disable-webapps --enable-gtk-doc
 make %{?_smp_mflags}
 
@@ -81,10 +85,17 @@ find %{buildroot} -regex ".*\.la$" | xargs rm -f --
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post daemon
+%systemd_user_post %{name}daemon.service
+
+%preun
+%systemd_user_preun %{name}daemon.service
+
 
 %files
-%doc COPYING.LGPL COPYING
+%license COPYING.LGPL COPYING
 %{_libdir}/libbamf3.so.*
+%{_libdir}/girepository-1.0/Bamf*.typelib
 
 %files devel
 %doc ChangeLog TODO
@@ -92,18 +103,24 @@ find %{buildroot} -regex ".*\.la$" | xargs rm -f --
 %{_libdir}/libbamf3.so
 %{_libdir}/pkgconfig/libbamf3.pc
 %{_datadir}/gtk-doc
-%{_libdir}/girepository-1.0/Bamf*.typelib
 %{_datadir}/gir-1.0/Bamf*.gir
 %dir %{_datadir}/vala
 %dir %{_datadir}/vala/vapi
 %{_datadir}/vala/vapi/libbamf3.vapi
 
-%files          daemon
+%files daemon
 %doc COPYING
 %{_libexecdir}/bamf
 %{_datadir}/dbus-1/services/*.service
+%{_userunitdir}/bamfdaemon.service
+%exclude %{_datadir}/upstart/sessions/bamfdaemon.conf
 
 %changelog
+* Tue Feb 21 2017 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.5.3-1
+- Update to 0.5.3
+- Package systemd user unit
+- Move Bamf-3.typelib back to main package
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index 6bbf2ec..8bb1a0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1a5b82819273adcc3e6ad6556c7dc90a  bamf-0.5.1.tar.gz
+SHA512 (bamf-0.5.3.tar.gz) = 8298c0f5826ea4bc2c2a756b1e2cb615d825830011e7c988ade5e6d3d060f9957720218f0950e4f11544597dfe54551df173fa7d62b00f8aeda55886ea7a487b