diff --git a/ChangeLog b/ChangeLog
index 1fe8eba6c..813e25b6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-20  Marcus Brinkmann  <marcus@g10code.com>
+
+	* configure.ac: Check for fusermount and encfs.
+
 2009-10-16  Marcus Brinkmann  <marcus@g10code.com>
 
 	* configure.ac: Check for libassuan instead of libassuan-pth.
diff --git a/g13/be-encfs.c b/g13/be-encfs.c
index 06e8792b3..250084a48 100644
--- a/g13/be-encfs.c
+++ b/g13/be-encfs.c
@@ -73,7 +73,7 @@ static void
 run_umount_helper (const char *mountpoint)
 {
   gpg_error_t err;
-  const char pgmname[] = "/usr/bin/fusermount";
+  const char pgmname[] = FUSERMOUNT;
   const char *args[3];
   
   args[0] = "-u";
@@ -254,7 +254,7 @@ run_encfs_tool (ctrl_t ctrl, enum encfs_cmds cmd,
       goto leave;
     }
 
-  pgmname = "/usr/bin/encfs";
+  pgmname = ENCFS;
   idx = 0;
   argv[idx++] = "-f";
   if (opt.verbose)