diff --git a/.mikaela/ssh/config b/.mikaela/ssh/config
index 279db1b2..9b82eae0 100644
--- a/.mikaela/ssh/config
+++ b/.mikaela/ssh/config
@@ -39,10 +39,7 @@ Host *
     # manual).
     UpdateHostKeys yes
 
-    # Add undocumented "UseRoaming no" to ssh_config or use
-    # "-oUseRoaming=no" to prevent upcoming #openssh client bug
-    # CVE-2016-0777. More later.
-    # ~~ https://twitter.com/msfriedl/status/687635945642967040
+    # Workaround CVE-2016-0777 & CVE-0778 on OpenSSH < 7.1p2
     UseRoaming no
 
     # Verify SSHFP records. In case DNSSEC is used this skips the
diff --git a/etc/ssh/ssh_config b/etc/ssh/ssh_config
index e63d593a..81303cf7 100644
--- a/etc/ssh/ssh_config
+++ b/etc/ssh/ssh_config
@@ -40,10 +40,7 @@ Host *
     # manual).
     UpdateHostKeys yes
 
-    # Add undocumented "UseRoaming no" to ssh_config or use
-    # "-oUseRoaming=no" to prevent upcoming #openssh client bug
-    # CVE-2016-0777. More later.
-    # ~~ https://twitter.com/msfriedl/status/687635945642967040
+    # Workaround CVE-2016-0777 & CVE-0778 on OpenSSH < 7.1p2
     UseRoaming no
 
     # Verify SSHFP records. In case DNSSEC is used this skips the