diff -u4rN sshfs-fuse-1.6-silencer1/debian/changelog sshfs-fuse-1.6/debian/changelog
--- sshfs-fuse-1.6-silencer1/debian/changelog	2007-07-11 17:25:26.000000000 +0200
+++ sshfs-fuse-1.6/debian/changelog	2007-07-11 17:12:15.000000000 +0200
@@ -1,4 +1,13 @@
+sshfs-fuse (1.6-1.silencer2) unstable; urgency=low
+
+  * Added alternative way of specifying ssh_config(5) options on the command
+    line, without having to hardcode every known or possibly not unuseful
+    option into sshfs-fuse itself. Otherwise it would be prone to break every
+    once in a while. Now "-o ssh_opt_SSHOPT=VAL" is possible, too.
+
+ -- Fabian Pietsch <fabian@canvon.dyndns.org>  Wed, 11 Jul 2007 17:11:32 +0200
+
 sshfs-fuse (1.6-1.silencer1) unstable; urgency=low
 
   * Added some more options from ssh_config(5) to sshfs.c, particularly to
     allow selectively turning off ControlPath to avoid a shared session.
diff -u4rN sshfs-fuse-1.6-silencer1/debian/sshfs.1 sshfs-fuse-1.6/debian/sshfs.1
--- sshfs-fuse-1.6-silencer1/debian/sshfs.1	2007-07-11 17:25:26.000000000 +0200
+++ sshfs-fuse-1.6/debian/sshfs.1	2007-07-11 17:05:49.000000000 +0200
@@ -87,10 +87,10 @@
 .TP
 \fB\-o\fR transform_symlinks
 transform absolute symlinks to relative
 .TP
-\fB\-o\fR SSHOPT=VAL
-ssh options (see man ssh_config)
+\fB\-o\fR SSHOPT=VAL  or  \fB\-o\fR ssh_opt_SSHOPT=VAL
+ssh options (see man ssh_config); if it doesn't work, retry with "ssh_opt_" prefix
 .SS "FUSE options:"
 .TP
 \fB\-d\fR   \fB\-o\fR debug
 enable debug output (implies \fB\-f\fR)
diff -u4rN sshfs-fuse-1.6-silencer1/sshfs.c sshfs-fuse-1.6/sshfs.c
--- sshfs-fuse-1.6-silencer1/sshfs.c	2007-07-11 17:25:26.000000000 +0200
+++ sshfs-fuse-1.6/sshfs.c	2007-07-11 17:27:50.000000000 +0200
@@ -238,8 +238,10 @@
     "VerifyHostKeyDNS",
     NULL,
 };
 
+#define SSH_OPT_PREFIX "ssh_opt_"
+
 enum {
     KEY_PORT,
     KEY_COMPRESS,
     KEY_HELP,
@@ -2303,8 +2305,9 @@
 "    -o sftp_server=SERV    path to sftp server or subsystem (default: sftp)\n"
 "    -o directport=PORT     directly connect to PORT bypassing ssh\n"
 "    -o transform_symlinks  transform absolute symlinks to relative\n"
 "    -o SSHOPT=VAL          ssh options (see man ssh_config)\n"
+"       (if it doesn't work, try: -o " SSH_OPT_PREFIX "SSHOPT=VAL)\n"
 "\n", progname);
 }
 
 static int is_ssh_opt(const char *arg)
@@ -2335,8 +2338,14 @@
             ssh_add_arg(tmp);
             g_free(tmp);
             return 0;
         }
+        if (strncasecmp(SSH_OPT_PREFIX, arg, strlen(SSH_OPT_PREFIX)) == 0) {
+            tmp = g_strdup_printf("-o%s", arg + strlen(SSH_OPT_PREFIX));
+            ssh_add_arg(tmp);
+            g_free(tmp);
+            return 0;
+        }
         return 1;
 
     case FUSE_OPT_KEY_NONOPT:
         if (!sshfs.host && strchr(arg, ':')) {