--- bash_completion	2013-12-03 11:08:42.038628800 +0100
+++ bash_completion_new	2013-12-03 11:11:15.160939500 +0100
@@ -1247,7 +1247,7 @@
     else
         for i in /etc/ssh/ssh_config "${HOME}/.ssh/config" \
             "${HOME}/.ssh2/config"; do
-            [ -r $i ] && config=( "${config[@]}" "$i" )
+            [ -r "$i" ] && config=( "${config[@]}" "$i" )
         done
     fi
 
@@ -1275,10 +1275,10 @@
         for i in /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 \
             /etc/known_hosts /etc/known_hosts2 ~/.ssh/known_hosts \
             ~/.ssh/known_hosts2; do
-            [ -r $i ] && kh=( "${kh[@]}" $i )
+            [ -r "$i" ] && kh=( "${kh[@]}" "$i" )
         done
         for i in /etc/ssh2/knownhosts ~/.ssh2/hostkeys; do
-            [ -d $i ] && khd=( "${khd[@]}" $i/*pub )
+            [ -d "$i" ] && khd=( "${khd[@]}" "$i"/*pub )
         done
     fi