diff --git a/.gitignore b/.gitignore
index 941d6be..0b7d37b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /accountsservice-0.6.12.tar.bz2
 /accountsservice-0.6.13.tar.xz
 /accountsservice-0.6.14.tar.xz
+/accountsservice-0.6.15.tar.xz
diff --git a/0001-Be-more-careful-when-resetting-the-users-icons.patch b/0001-Be-more-careful-when-resetting-the-users-icons.patch
new file mode 100644
index 0000000..a080010
--- /dev/null
+++ b/0001-Be-more-careful-when-resetting-the-users-icons.patch
@@ -0,0 +1,29 @@
+From 726343c9b597256c523c920b39a83b66f5b5f86a Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Tue, 29 Nov 2011 23:07:38 -0500
+Subject: [PATCH] Be more careful when resetting the users icons
+
+When the current icon is in /usr/share, and we reset the
+icon, we try to delete a nonexisting icon file in
+/var/lib/AccountsService/icons. Deal with this eventuality.
+---
+ src/user.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/user.c b/src/user.c
+index e0e9445..fbc91be 100644
+--- a/src/user.c
++++ b/src/user.c
+@@ -1397,7 +1397,8 @@ user_change_icon_file_authorized_cb (Daemon                *daemon,
+                 g_free (dest_path);
+ 
+                 error = NULL;
+-                if (!g_file_delete (dest, NULL, &error)) {
++                if (!g_file_delete (dest, NULL, &error) &&
++                    !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) {
+                         g_object_unref (dest);
+                         throw_error (context, ERROR_FAILED, "failed to remove user icon, %s", error->message);
+                         g_error_free (error);
+-- 
+1.7.7.3
+
diff --git a/accountsservice.spec b/accountsservice.spec
index 993eb2f..4389957 100644
--- a/accountsservice.spec
+++ b/accountsservice.spec
@@ -1,6 +1,6 @@
 
 Name:           accountsservice
-Version:        0.6.14
+Version:        0.6.15
 Release:        2%{?dist}
 Summary:        D-Bus interfaces for querying and manipulating user account information
 
@@ -20,7 +20,7 @@ BuildRequires:  gobject-introspection-devel
 Requires:       polkit
 Requires:       shadow-utils
 
-Patch0: fix-wtmp-loading.patch
+Patch0: 0001-Be-more-careful-when-resetting-the-users-icons.patch
 
 %package libs
 Summary: Client-side library to talk to accountservice
@@ -51,7 +51,7 @@ of these interfaces, based on the useradd, usermod and userdel commands.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-wtmp-loading
+%patch0 -p1
 
 %build
 %configure
@@ -90,6 +90,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.a
 %{_datadir}/gir-1.0/AccountsService-1.0.gir
 
 %changelog
+* Tue Nov 29 2011 Matthias Clasen <mclasen@redhat.com> 0.6.15-2
+- Make resetting user icons work
+- Update to 0.6.15
+- Fixes session chooser at login screen when logged into vt
+
 * Wed Sep 21 2011 Ray Strode <rstrode@redhat.com> 0.6.14-2
 - Fix wtmp loading so users coming from the network are
   remembered in the user list in subsequent boots
diff --git a/fix-wtmp-loading.patch b/fix-wtmp-loading.patch
deleted file mode 100644
index bb9d914..0000000
--- a/fix-wtmp-loading.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b73f539602f74271650a102d90253dc697488478 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Wed, 21 Sep 2011 17:20:24 -0400
-Subject: [PATCH] daemon: load wtmp after passwd file
-
-The passwd file handling code clears the list of loaded
-users so we need to always do wtmp on top of it, instead of
-before it.
----
- src/daemon.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/daemon.c b/src/daemon.c
-index 79915a7..99ee161 100644
---- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -427,8 +427,8 @@ reload_data (Daemon *daemon)
- static void
- reload_users (Daemon *daemon)
- {
--        reload_wtmp_history (daemon);
-         reload_passwd (daemon);
-+        reload_wtmp_history (daemon);
-         reload_data (daemon);
- }
- 
--- 
-1.7.6.2
-
diff --git a/sources b/sources
index 4f44cc1..0f93ddc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3422ff158ee2834344c534516e5e8a9d  accountsservice-0.6.14.tar.xz
+47b5af77b544528c02d82761bd574c09  accountsservice-0.6.15.tar.xz