diff -u dbus-1.1.20/debian/changelog dbus-1.1.20/debian/changelog
--- dbus-1.1.20/debian/changelog
+++ dbus-1.1.20/debian/changelog
@@ -1,3 +1,13 @@
+dbus (1.1.20-1ubuntu3) hardy-proposed; urgency=low
+
+  * Add debian/patches/90_dbus_zfs_fix.patch:
+    - Fix memory corruption on FUSE filesystems.
+      https://bugs.freedesktop.org/attachment.cgi?id=16746
+      https://bugs.freedesktop.org/show_bug.cgi?id=15922
+    - Patch backported from 1.2.x, thanks to Rudd-O!
+
+ -- Rudd-O <rudd-o@rudd-o.com>  Fri, 20 June 2008 07:05:03 -0500
+
 dbus (1.1.20-1ubuntu2) hardy-proposed; urgency=low
 
   * Add debian/patches/03_fix_inotify.patch:
only in patch2:
unchanged:
--- dbus-1.1.20.orig/debian/patches/90_dbus_zfs_fix.patch
+++ dbus-1.1.20/debian/patches/90_dbus_zfs_fix.patch
@@ -0,0 +1,24 @@
+diff --git dbus/dbus-sysdeps-util-unix.c dbus/dbus-sysdeps-util-unix.c
+index 9ff3fbc..cc869de 100644
+--- dbus/dbus-sysdeps-util-unix.c
++++ dbus/dbus-sysdeps-util-unix.c
+@@ -671,6 +671,7 @@ static dbus_bool_t
+ dirent_buf_size(DIR * dirp, size_t *size)
+ {
+  long name_max;
++ int errno_before=errno;
+ #   if defined(HAVE_FPATHCONF) && defined(_PC_NAME_MAX)
+ #      if defined(HAVE_DIRFD)
+           name_max = fpathconf(dirfd(dirp), _PC_NAME_MAX);
+@@ -679,7 +680,9 @@ dirent_buf_size(DIR * dirp, size_t *size)
+ #      else
+           name_max = fpathconf(dirp->__dd_fd, _PC_NAME_MAX);
+ #      endif /* HAVE_DIRFD */
+-     if (name_max == -1)
++     if ((name_max == -1 || name_max == 0 ) && errno == errno_before)
++       name_max=PATH_MAX;
++     else if (name_max ==-1)
+ #           if defined(NAME_MAX)
+ 	     name_max = NAME_MAX;
+ #           else
+