diff --git a/.gitignore b/.gitignore
index c9f23ef..7625cff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ gvfs-1.6.3.tar.bz2
 /gvfs-1.15.1.tar.xz
 /gvfs-1.15.2.tar.xz
 /gvfs-1.15.3.tar.xz
+/gvfs-1.15.4.tar.xz
diff --git a/gvfs-1.15.4-tmpfilesd.patch b/gvfs-1.15.4-tmpfilesd.patch
deleted file mode 100644
index ab1f57a..0000000
--- a/gvfs-1.15.4-tmpfilesd.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 657330aa51ec65b9e5c247365bf5eb067ef62915 Mon Sep 17 00:00:00 2001
-From: Tomas Bzatek <tbzatek@redhat.com>
-Date: Wed, 06 Feb 2013 15:02:06 +0000
-Subject: fuse: Install systemd tmpfiles.d exclusion file
-
-We need to tell systemd to stay out of our fuse mounts before
-any data are destroyed.
-
-This patch reuses libsystemd-login detection as long as there is no
-general header or pkg-config file in systemd.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=902743
-https://bugs.archlinux.org/task/32715
-https://bugzilla.gnome.org/show_bug.cgi?id=560658
----
-diff --git a/client/Makefile.am b/client/Makefile.am
-index 5613d58..356bb57 100644
---- a/client/Makefile.am
-+++ b/client/Makefile.am
-@@ -81,4 +81,19 @@ gvfsd_fuse_LDADD = \
- 	$(top_builddir)/common/libgvfscommon.la \
- 	$(GLIB_LIBS) $(FUSE_LIBS)
- 
-+
-+# FIXME: reusing USE_LIBSYSTEMD_LOGIN as systemd has no universal header or pkg-config file
-+if USE_LIBSYSTEMD_LOGIN
-+
-+# FIXME: hardcoded path (systemd doesn't use lib64)
-+tmpfilesddir = $(prefix)/lib/tmpfiles.d
-+tmpfilesd_DATA = gvfsd-fuse-tmpfiles.conf
-+
-+endif
-+
- endif
-+
-+
-+EXTRA_DIST = \
-+	gvfsd-fuse-tmpfiles.conf	\
-+	$(NULL)
-diff --git a/client/gvfsd-fuse-tmpfiles.conf b/client/gvfsd-fuse-tmpfiles.conf
-new file mode 100644
-index 0000000..d808f2e
---- a/dev/null
-+++ b/client/gvfsd-fuse-tmpfiles.conf
-@@ -0,0 +1,14 @@
-+# This is a systemd tmpfiles.d configuration file
-+#
-+# tmpfiles.d defaults are set to clean /run/user every now and then
-+# which includes our gvfs-fuse mount being mounted in /run/user/<id>/gvfs
-+#
-+# This file adds an exclusion rule so that user data don't get automatically
-+# cleaned up (i.e. destroyed).
-+#
-+# Due to our fuse mount restrictions root can't access nor stat the mountpoint
-+# resulting in warning spitted out by the systemd-tmpfiles process. Please
-+# ignore it for the time being until proper solution is found:
-+# https://bugzilla.gnome.org/show_bug.cgi?id=560658
-+
-+x /run/user/*/gvfs
---
-cgit v0.9.0.2
diff --git a/gvfs.spec b/gvfs.spec
index 4758649..e64d34f 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.15.3
-Release: 2%{?dist}
+Version: 1.15.4
+Release: 1%{?dist}
 License: GPLv3 and LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -38,9 +38,6 @@ BuildRequires: libtool
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=567235
 Patch0: gvfs-archive-integration.patch
-# from upstream
-Patch1: gvfs-1.15.4-tmpfilesd.patch
-
 
 Obsoletes: gnome-mount <= 0.8
 Obsoletes: gnome-mount-nautilus-properties <= 0.8
@@ -177,7 +174,6 @@ file services.
 %prep
 %setup -q
 %patch0 -p1 -b .archive-integration
-%patch1 -p1 -b .tmpfilesd
 
 %build
 # Needed for gvfs-0.2.1-archive-integration.patch
@@ -374,6 +370,9 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/remote-volume-monitors/goa.monitor
 
 %changelog
+* Mon Mar 04 2013 Richard Hughes <rhughes@redhat.com> - 1.15.4-1
+- Update to 1.15.4
+
 * Wed Feb  6 2013 Tomas Bzatek <tbzatek@redhat.com> - 1.15.3-2
 - Install systemd tmpfiles.d exclusion file for gvfs-fuse (#902743)
 
diff --git a/sources b/sources
index 64e2cbf..3257c06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-748dcb2dae0cdcf6afb47c23bb9bc97c  gvfs-1.15.3.tar.xz
+a42f2600a46685089d8c03a34e6209ae  gvfs-1.15.4.tar.xz