--- /tmp/ssh.bak	2011-12-03 17:40:27.000000000 +1000
+++ /etc/bash_completion.d/ssh	2011-12-03 17:45:23.000000000 +1000
@@ -127,7 +127,12 @@
     _ssh_suboption_check && return 0
 
     case $prev in
-        -F|-i|-S)
+        -i)
+            type compopt &>/dev/null && compopt -o plusdirs
+            _ssh-add
+            return 0
+            ;;
+        -F|-S)
             _filedir
             return 0
             ;;