diff --git a/.ssh/config.d/10_global b/.ssh/config.d/10_global
new file mode 100644
index 0000000000000000000000000000000000000000..d50406ace748cbadc288e4c89f92a2a5e1b8d247
--- /dev/null
+++ b/.ssh/config.d/10_global
@@ -0,0 +1,9 @@
+# vim:ft=sshconfig
+Compression yes
+ControlMaster auto
+ControlPath ~/.ssh/cm_%C.sock
+ControlPersist 3m
+ServerAliveInterval 30
+IdentitiesOnly yes
+ForwardAgent no
+HashKnownHosts yes
diff --git a/.ssh/config.d/99_default b/.ssh/config.d/99_default
new file mode 100644
index 0000000000000000000000000000000000000000..99e71b6bb4dfd7009660f356de6ea5303a230d21
--- /dev/null
+++ b/.ssh/config.d/99_default
@@ -0,0 +1,8 @@
+
+# vim:ft=sshconfig
+# Copied from
+# https://wiki.mozilla.org/Security/Guidelines/OpenSSH?source=techstories.org#Modern
+HostKeyAlgorithms ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-ed25519,ssh-rsa,ecdsa-sha2-nistp521-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp521,ecdsa-sha2-nistp384,ecdsa-sha2-nistp256
+KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256
+MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
+Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr