diff -up openssh-6.6p1/readconf.c.roaming openssh-6.6p1/readconf.c
--- openssh-6.6p1/readconf.c.roaming 2016-01-13 15:42:00.423573980 +0100
+++ openssh-6.6p1/readconf.c 2016-01-13 15:43:03.565529448 +0100
@@ -1608,7 +1608,7 @@ initialize_options(Options * options)
options->tun_remote = -1;
options->local_command = NULL;
options->permit_local_command = -1;
- options->use_roaming = -1;
+ options->use_roaming = 0;
options->visual_host_key = -1;
options->ip_qos_interactive = -1;
options->ip_qos_bulk = -1;
@@ -1783,8 +1783,7 @@ fill_default_options(Options * options)
options->tun_remote = SSH_TUNID_ANY;
if (options->permit_local_command == -1)
options->permit_local_command = 0;
- if (options->use_roaming == -1)
- options->use_roaming = 1;
if (options->visual_host_key == -1)
options->visual_host_key = 0;
if (options->ip_qos_interactive == -1)