diff --git a/0001-systemd-disable-GVFS-support.patch b/0001-systemd-disable-GVFS-support.patch
new file mode 100644
index 0000000..d25698c
--- /dev/null
+++ b/0001-systemd-disable-GVFS-support.patch
@@ -0,0 +1,48 @@
+From 7933036127ff707718e45b805937d23d85b25c6d Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Tue, 31 May 2016 16:12:38 -0400
+Subject: [PATCH] systemd: disable GVFS support
+
+accountsservice doesn't need support for GVFS modules,
+and those modules lead to /root/.cache getting created
+at startup.
+
+accountsservice runs as root, but shouldn't be touching /root.
+
+This commit disables GVFS for accountsservice
+---
+ data/accounts-daemon.service.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/data/accounts-daemon.service.in b/data/accounts-daemon.service.in
+index feedf3e..2f5fe33 100644
+--- a/data/accounts-daemon.service.in
++++ b/data/accounts-daemon.service.in
+@@ -1,21 +1,24 @@
+ [Unit]
+ Description=Accounts Service
+ 
+ # In order to avoid races with identity-providing services like SSSD or
+ # winbind, we need to ensure that Accounts Service starts after
+ # nss-user-lookup.target
+ After=nss-user-lookup.target
+ Wants=nss-user-lookup.target
+ 
+ [Service]
+ Type=dbus
+ BusName=org.freedesktop.Accounts
+ ExecStart=@libexecdir@/accounts-daemon
+ StandardOutput=syslog
++Environment=GVFS_DISABLE_FUSE=1
++Environment=GIO_USE_VFS=local
++Environment=GVFS_REMOTE_VOLUME_MONITOR_IGNORE=1
+ 
+ [Install]
+ # We pull this in by graphical.target instead of waiting for the bus
+ # activation, to speed things up a little: gdm uses this anyway so it is nice
+ # if it is already around when gdm wants to use it and doesn't have to wait for
+ # it.
+ WantedBy=graphical.target
+-- 
+2.8.1
+
diff --git a/accountsservice.spec b/accountsservice.spec
index 7af8bfb..73983c8 100644
--- a/accountsservice.spec
+++ b/accountsservice.spec
@@ -2,7 +2,7 @@
 
 Name:           accountsservice
 Version:        0.6.40
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        D-Bus interfaces for querying and manipulating user account information
 
 Group:          System Environment/Daemons
@@ -10,6 +10,7 @@ License:        GPLv3+
 URL:            http://www.fedoraproject.org/wiki/Features/UserAccountDialog
 #VCS: git:git://git.freedesktop.org/accountsservice
 Source0:        http://www.freedesktop.org/software/accountsservice/accountsservice-%{version}.tar.xz
+Patch0:         0001-systemd-disable-GVFS-support.patch
 
 BuildRequires:  glib2-devel
 BuildRequires:  polkit-devel
@@ -55,6 +56,7 @@ of these interfaces, based on the useradd, usermod and userdel commands.
 
 %prep
 %setup -q
+%patch0 -p1 -b .disable-GVFS-support
 
 %build
 %configure --enable-user-heuristics
@@ -107,6 +109,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.a
 %{_datadir}/gtk-doc/html/libaccountsservice/*
 
 %changelog
+* Tue May 31 2016 Ray Strode <rstrode@redhat.com> - 0.6.40-4
+- Don't create /root/.cache at startup
+  Resolves: #1331926
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.40-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild