diff -u avfs-1.0.0/debian/changelog avfs-1.0.0/debian/changelog
--- avfs-1.0.0/debian/changelog
+++ avfs-1.0.0/debian/changelog
@@ -1,3 +1,18 @@
+avfs (1.0.0-2ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing. (LP: #906369) Remaining changes:
+    - debian/patches/O_CREAT: fix FTBFS when open is invoked with O_CREAT.
+    - debian/patches/fix-format-security: fix FTBFS again due to
+      -Werror=format-security issues
+
+ -- Mahyuddin Susanto <udienz@ubuntu.com>  Mon, 19 Dec 2011 22:48:55 +0700
+
+avfs (1.0.0-2) unstable; urgency=low
+
+  * Made avfs work correctly with kFreeBSD. (Closes: #634364)
+
+ -- Michael Meskes <meskes@debian.org>  Tue, 15 Nov 2011 11:01:24 +0100
+
 avfs (1.0.0-1ubuntu1) precise; urgency=low
 
   * Merge from debian testing. Remaining changes:
diff -u avfs-1.0.0/debian/control avfs-1.0.0/debian/control
--- avfs-1.0.0/debian/control
+++ avfs-1.0.0/debian/control
@@ -8,7 +8,7 @@
 
 Package: avfs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, fuse
+Depends: ${shlibs:Depends}, ${misc:Depends}, fuse [linux-any] | fuse4bsd [kfreebsd-any]
 Suggests: unzip, zip, arj, lha, zoo, rpm, p7zip|p7zip-full, cdparanoia, wget
 Description: virtual filesystem to access archives, disk images, remote locations
  This FUSE-base VFS (Virtual FileSystem) enables all programs to look inside
diff -u avfs-1.0.0/debian/patches/series avfs-1.0.0/debian/patches/series
--- avfs-1.0.0/debian/patches/series
+++ avfs-1.0.0/debian/patches/series
@@ -7 +7 @@
-
+kfreebsd
only in patch2:
unchanged:
--- avfs-1.0.0.orig/debian/patches/kfreebsd
+++ avfs-1.0.0/debian/patches/kfreebsd
@@ -0,0 +1,29 @@
+--- avfs/scripts/umountavfs	2011-11-15 10:13:57.000000000 +0100
++++ avfs/scripts/umountavfs	2011-11-15 10:15:46.000000000 +0100
+@@ -14,9 +14,13 @@
+     MntDir="${HOME}/.avfs"
+ fi
+ 
+-grep -q "avfsd ${MntDir}" /proc/mounts && {
++grep -qE "${MntDir}.*avfsd" /proc/mounts && {
+    echo unMounting AVFS on $MntDir...
+-   fusermount -u "$MntDir"
++   if [ -x /bin/fusermount ]; then
++       fusermount -u "$MntDir"
++   else
++       umount "$MntDir"
++   fi
+ }
+ 
+ # Remove directory again
+--- avfs/scripts/mountavfs	2011-08-24 11:19:25.000000000 +0200
++++ avfs/scripts/mountavfs	2011-11-15 11:51:45.000000000 +0100
+@@ -24,6 +24,8 @@
+    fi
+    echo Mounting AVFS on $MntDir...
+    avfsd "$MntDir"
++   # Wait for avfsd to come up
++   while [ ! -e "$MntDir/#avfsstat/symlink_rewrite" ]; do sleep 1; done
+    echo "1" >"$MntDir/#avfsstat/symlink_rewrite"
+ }
+