diff --git a/accountsservice.spec b/accountsservice.spec
index 97da7b6..41c1a92 100644
--- a/accountsservice.spec
+++ b/accountsservice.spec
@@ -1,21 +1,20 @@
 
 Name:           accountsservice
-Version:        0.6
-Release:        2%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        D-Bus interfaces for querying and manipulating user account information
 
 Group:          System Environment/Daemons
 License:        GPLv3+
 URL:            http://www.fedoraproject.org/wiki/Features/UserAccountDialog
 #VCS: git:git://git.freedesktop.org/accountsservice
-Source0:        http://mclasen.fedorapeople.org/accounts/accountsservice-0.6.tar.bz2
+Source0:        http://mclasen.fedorapeople.org/accounts/accountsservice-0.6.1.tar.bz2
 
-# upstream fix
-Patch0:         0001-Always-emit-changed-signal-when-setting-user-photo.patch
 BuildRequires:  glib2-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  polkit-devel
 BuildRequires:  intltool
+BuildRequires:  systemd-units
 
 Requires:       polkit
 Requires:       ConsoleKit
@@ -28,7 +27,6 @@ of these interfaces, based on the useradd, usermod and userdel commands.
 
 %prep
 %setup -q
-%patch0 -p1 -b .icon-change
 
 %build
 %configure
@@ -36,15 +34,11 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang accounts-service
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
+%files -f accounts-service.lang
 %defattr(-,root,root,-)
 %doc COPYING README AUTHORS
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.Accounts.conf
@@ -56,9 +50,14 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_localstatedir}/lib/AccountsService/
 %dir %{_localstatedir}/lib/AccountsService/users
 %dir %{_localstatedir}/lib/AccountsService/icons
+/lib/systemd/system/accounts-daemon.service
 
 
 %changelog
+* Wed Jul 21 2010 Matthias Clasen <mclasen@redhat.com> 0.6.1-1
+- Update to 0.6.1
+- Install systemd unit file
+
 * Mon Apr  5 2010 Matthias Clasen <mclasen@redhat.com> 0.6-2
 - Always emit changed signal on icon change