diff --git a/gphoto-unmount-hang.patch b/gphoto-unmount-hang.patch
new file mode 100644
index 0000000..273eaf8
--- /dev/null
+++ b/gphoto-unmount-hang.patch
@@ -0,0 +1,12 @@
+diff -up gvfs-0.2.3/daemon/gvfsbackendgphoto2.c.gphoto-unmount-hang gvfs-0.2.3/daemon/gvfsbackendgphoto2.c
+--- gvfs-0.2.3/daemon/gvfsbackendgphoto2.c.gphoto-unmount-hang	2008-04-16 22:53:04.000000000 -0400
++++ gvfs-0.2.3/daemon/gvfsbackendgphoto2.c	2008-04-16 22:52:39.000000000 -0400
+@@ -1394,6 +1394,8 @@ do_mount (GVfsBackend *backend,
+       return;
+     }
+   
++  dbus_connection_set_exit_on_disconnect (gphoto2_backend->dbus_connection, FALSE);
++
+   gphoto2_backend->hal_ctx = libhal_ctx_new ();
+   if (gphoto2_backend->hal_ctx == NULL)
+     {
diff --git a/gvfs.spec b/gvfs.spec
index 42ef111..652fb68 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 0.2.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -37,6 +37,7 @@ Patch1: gvfs-0.2.2-archive-integration.patch
 Patch2: gvfs-64clean.patch
 Patch3: regexxer-crash.patch
 Patch4: gvfs-0.2.2-only-show-allowed-mounts.patch
+Patch5: gphoto-unmount-hang.patch
 
 %description
 The gvfs package provides backend implementations for the gio 
@@ -69,6 +70,7 @@ to access the gvfs filesystems.
 %patch2 -p1 -b .64clean
 %patch3 -p1 -b .regexxer-crash
 %patch4 -p0 -b .only-show-allowed-mounts
+%patch5 -p1 -b .gphoto-unmount-hang
 
 %build
 
@@ -182,6 +184,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Wed Apr 16 2008 Matthias Clasen <mclasen@redhat.com> - 0.2.3-5
+- Fix hangs when unmounting gphoto mounts
+
 * Wed Apr 16 2008 David Zeuthen <davidz@redhat.com> - 0.2.3-4
 - Only show mounts in /media and inside $HOME (#442189)