diff --git a/.cvsignore b/.cvsignore
index ac3976c..80f33dd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gvfs-1.5.3.tar.bz2
+gvfs-1.5.4.tar.bz2
diff --git a/gvfs.spec b/gvfs.spec
index 4210638..9846689 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,12 +1,11 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.5.3
-Release: 2%{?dist}
+Version: 1.5.4
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
 Source: http://download.gnome.org/sources/gvfs/1.5/gvfs-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig
 BuildRequires: glib2-devel >= 2.23.2
 BuildRequires: dbus-glib-devel
@@ -36,10 +35,6 @@ BuildRequires: libtool
 # http://bugzilla.gnome.org/show_bug.cgi?id=567235
 Patch0: gvfs-archive-integration.patch
 
-# gvfsd-sftp crashes on unmount
-# https://bugzilla.redhat.com/show_bug.cgi?id=557548
-Patch1: gvfs-1.5.4-sftp-unmount.patch
-
 # Recognize gphoto2 cameras which don't implement get storageinfo
 # https://bugzilla.redhat.com/show_bug.cgi?id=552856
 Patch15: gvfs-1.5.1-gphoto2-no-storageinfo-support.patch
@@ -139,7 +134,6 @@ including phones and music players to applications using gvfs.
 %prep
 %setup -q
 %patch0 -p1 -b .archive-integration
-%patch1 -p1 -b .sftp-unmount
 %patch15 -p1 -b .gphoto2-storageinfo
 
 
@@ -321,6 +315,9 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Mon Feb 22 2010 Matthias Clasen <mclasen@redhat.com> - 1.5.4-1
+- Update to 1.5.4
+
 * Mon Feb 15 2010 Tomas Bzatek <tbzatek@redhat.com> - 1.5.3-2
 - sftp: fix crash on unmount
 
diff --git a/sources b/sources
index 7cd78a1..67df465 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e0540360ccc0943d6a0c93c79981deee  gvfs-1.5.3.tar.bz2
+1e766cbb66c998ff8c382f20136f7377  gvfs-1.5.4.tar.bz2