diff -Nru cryptkeeper-0.9.5/debian/changelog cryptkeeper-0.9.5/debian/changelog
--- cryptkeeper-0.9.5/debian/changelog	2011-11-27 15:33:45.000000000 +0000
+++ cryptkeeper-0.9.5/debian/changelog	2011-12-12 21:09:11.000000000 +0000
@@ -1,3 +1,19 @@
+cryptkeeper (0.9.5-5) unstable; urgency=low
+
+  * Added debian/patches/kfreebsd.patch to fix problem on kfreebsd. (Closes:
+    #651875)
+  * debian/control: modified according to kfreebsd.patch.
+
+ -- Francesco Namuri <francesco@namuri.it>  Mon, 12 Dec 2011 22:03:11 +0100
+
+cryptkeeper (0.9.5-4) unstable; urgency=low
+
+  * debian/control: restored architecture field to any. Now encfs is available
+    again on all architecture. (Closes: #650144)
+  * Added headers on all patches.
+
+ -- Francesco Namuri <francesco@namuri.it>  Sun, 11 Dec 2011 15:31:08 +0100
+
 cryptkeeper (0.9.5-3) unstable; urgency=low
 
   * debian/control: limited architecture to linux-all; on other architectures
diff -Nru cryptkeeper-0.9.5/debian/control cryptkeeper-0.9.5/debian/control
--- cryptkeeper-0.9.5/debian/control	2011-11-27 15:32:15.000000000 +0000
+++ cryptkeeper-0.9.5/debian/control	2011-12-12 20:55:47.000000000 +0000
@@ -8,8 +8,8 @@
 DM-Upload-Allowed:yes
 
 Package: cryptkeeper
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, zenity, fuse-utils, encfs
+Architecture: linux-any kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}, zenity, fuse [linux-any], encfs
 Description: EncFS system tray applet for GNOME
  An encrypted folders manager, it allows users to mount and unmount encfs
  folders, to change the password and to create new crypted folders. It
diff -Nru cryptkeeper-0.9.5/debian/patches/binutils-gold.diff cryptkeeper-0.9.5/debian/patches/binutils-gold.diff
--- cryptkeeper-0.9.5/debian/patches/binutils-gold.diff	2011-10-16 11:13:20.000000000 +0000
+++ cryptkeeper-0.9.5/debian/patches/binutils-gold.diff	2011-12-11 14:25:59.000000000 +0000
@@ -1,7 +1,9 @@
+Description: Fixes a build failure using binutils-gold
+Author: Franceco Namuri <francesco@namuri.it>
 Index: cryptkeeper-0.9.5/configure
 ===================================================================
 --- cryptkeeper-0.9.5.orig/configure	2009-10-18 13:58:01.000000000 +0200
-+++ cryptkeeper-0.9.5/configure	2011-10-15 16:09:00.693215704 +0200
++++ cryptkeeper-0.9.5/configure	2011-12-11 12:04:13.045285159 +0100
 @@ -6707,7 +6707,7 @@
  
  CFLAGS="$CFLAGS $DEP_CFLAGS $GNOME_KEYRING_CFLAGS"
diff -Nru cryptkeeper-0.9.5/debian/patches/fix_cryptkeeper.desktop.patch cryptkeeper-0.9.5/debian/patches/fix_cryptkeeper.desktop.patch
--- cryptkeeper-0.9.5/debian/patches/fix_cryptkeeper.desktop.patch	2011-10-16 11:13:20.000000000 +0000
+++ cryptkeeper-0.9.5/debian/patches/fix_cryptkeeper.desktop.patch	2011-12-11 14:26:58.000000000 +0000
@@ -1,6 +1,9 @@
-diff -Nur cryptkeeper-0.9.1/cryptkeeper.desktop cryptkeeper-0.9.1.new/cryptkeeper.desktop
---- cryptkeeper-0.9.1/cryptkeeper.desktop	2007-04-21 04:26:51.000000000 +0200
-+++ cryptkeeper-0.9.1.new/cryptkeeper.desktop	2008-02-05 15:42:31.000000000 +0100
+Description: Fixes the category of cryptkeeper menu item
+Author: Francesco Namuri <francesco@namuri.it>
+Index: cryptkeeper-0.9.5/cryptkeeper.desktop
+===================================================================
+--- cryptkeeper-0.9.5.orig/cryptkeeper.desktop	2011-12-11 12:04:59.053286893 +0100
++++ cryptkeeper-0.9.5/cryptkeeper.desktop	2011-12-11 12:05:02.777287034 +0100
 @@ -1,9 +1,8 @@
  [Desktop Entry]
 -Encoding=UTF-8
diff -Nru cryptkeeper-0.9.5/debian/patches/kfreebsd.patch cryptkeeper-0.9.5/debian/patches/kfreebsd.patch
--- cryptkeeper-0.9.5/debian/patches/kfreebsd.patch	1970-01-01 00:00:00.000000000 +0000
+++ cryptkeeper-0.9.5/debian/patches/kfreebsd.patch	2011-12-12 21:02:57.000000000 +0000
@@ -0,0 +1,22 @@
+Description: Fix a dependency problem on GNU/kFreeBSD 
+ that makes cryptkeeper  uninstallable on this
+ architecture.
+Bug-Debian: http://bugs.debian.org/651875
+Author: Robert Millan <rmh@debian.org>
+Index: cryptkeeper-0.9.5/src/encfs_wrapper.cpp
+===================================================================
+--- cryptkeeper-0.9.5.orig/src/encfs_wrapper.cpp	2011-12-12 21:58:50.120765038 +0100
++++ cryptkeeper-0.9.5/src/encfs_wrapper.cpp	2011-12-12 21:58:50.144765043 +0100
+@@ -242,7 +242,11 @@
+ 	// unmount
+ 	int pid = fork ();
+ 	if (pid == 0) {
+-		execlp ("fusermount", "fusermount", "-u", mount_dir, NULL);
++		#ifdef __linux__
++			execlp ("fusermount", "fusermount", "-u", mount_dir, NULL);
++		#else
++			execlp ("umount", "umount", mount_dir, NULL);
++		#endif
+ 		exit (0);
+ 	}
+ 	int status;
diff -Nru cryptkeeper-0.9.5/debian/patches/series cryptkeeper-0.9.5/debian/patches/series
--- cryptkeeper-0.9.5/debian/patches/series	2011-10-16 11:13:20.000000000 +0000
+++ cryptkeeper-0.9.5/debian/patches/series	2011-12-12 20:56:35.000000000 +0000
@@ -1,3 +1,4 @@
 fix_cryptkeeper.desktop.patch
 is_mounted_overflow_fix.patch
 binutils-gold.diff
+kfreebsd.patch