diff --git a/scripts/ssh/ssh-connect.php b/scripts/ssh/ssh-connect.php
--- a/scripts/ssh/ssh-connect.php
+++ b/scripts/ssh/ssh-connect.php
@@ -27,7 +27,15 @@
       'param' => pht('port'),
       'help' => pht('Port number to connect to.'),
     ),
+    array(
+      'name' => 'options',
+      'short' => 'o',
+      'param' => pht('options'),
+      'repeat' => true,
+      'help' => pht('SSH options.'),
+    ),
   ));
+
 $unconsumed_argv = $args->getUnconsumedArgumentVector();
 
 if (function_exists('pcntl_signal')) {
@@ -113,6 +121,15 @@
   $arguments[] = $port;
 }
 
+$options = $args->getArg('options');
+
+if (!empty($options)) {
+    foreach ($options as $option) {
+        $pattern[] = '-o %s';
+        $arguments[] = $option;
+    }
+}
+
 $pattern[] = '--';
 
 $pattern[] = '%s';