diff --git a/changelog.md b/changelog.md
index 21c296a8..39073b8e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -16,6 +16,7 @@ Documentation
 ---------
 * Add `--ssh-jump` to TIPS.
 * Better document `/dsn show`.
+* Improve `ssh_options` commentary.
 
 
 Internal
diff --git a/mycli/myclirc b/mycli/myclirc
index 79185856..4bfb6e3a 100644
--- a/mycli/myclirc
+++ b/mycli/myclirc
@@ -310,6 +310,7 @@ emacs_ttimeoutlen = 0.5
 ssh_executable = ssh
 
 # Options to pass to the ssh executable when making a tunnel.
+# The defaults may need to be changed if not using OpenSSH.
 ssh_options = -a -o ServerAliveInterval=60 -o ExitOnForwardFailure=yes -o IPQoS=af13 -o LogLevel=FATAL
 
 # Method for establishing the local side of the SSH tunnel: auto, port, socket.
diff --git a/test/myclirc b/test/myclirc
index 55e0c3d3..4ee66152 100644
--- a/test/myclirc
+++ b/test/myclirc
@@ -310,6 +310,7 @@ emacs_ttimeoutlen = 0.5
 ssh_executable = ssh
 
 # Options to pass to the ssh executable when making a tunnel.
+# The defaults may need to be changed if not using OpenSSH.
 ssh_options = -a -o ServerAliveInterval=60 -o ExitOnForwardFailure=yes -o IPQoS=af13 -o LogLevel=FATAL
 
 # Method for establishing the local side of the SSH tunnel: auto, port, socket.