diff -Nru openssh-8.4p1.orig/ssh_config openssh-8.4p1/ssh_config
--- openssh-8.4p1.orig/ssh_config	2020-09-27 09:25:01.000000000 +0200
+++ openssh-8.4p1/ssh_config	2020-10-20 11:17:52.626000000 +0200
@@ -17,9 +17,9 @@
 # list of available options, their meanings and defaults, please see the
 # ssh_config(5) man page.
 
-# Host *
+Host *
 #   ForwardAgent no
-#   ForwardX11 no
+    ForwardX11 no
 #   PasswordAuthentication yes
 #   HostbasedAuthentication no
 #   GSSAPIAuthentication no
@@ -43,4 +43,6 @@
 #   VisualHostKey no
 #   ProxyCommand ssh -q -W %h:%p gateway.example.com
 #   RekeyLimit 1G 1h
+    SendEnv LANG LC_*
+    ServerAliveInterval 60
 #   UserKnownHostsFile ~/.ssh/known_hosts.d/%k