diff --git a/bash_completion b/bash_completion
index 07fe78c..1b55a97 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1172,6 +1172,8 @@ _known_hosts_real()
 			COMPREPLY=( $( awk 'BEGIN {FS=","}
 				/^\s*[^|\#]/ {for (i=1; i<=2; ++i) { \
 				       gsub(" .*$", "", $i); \
+				       gsub("[\\[\\]]", "", $i); \
+				       gsub(":[0-9]+$", "", $i); \
 				       if ($i ~ /'"$awkcur"'/) {print $i} \
 				}}' "${kh[@]}" 2>/dev/null ) )
 		fi