diff --git a/bash_completion b/bash_completion
index 9b421119..dab669fa 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1,6 +1,6 @@
 #   bash_completion - some programmable completion functions for bash 2.05a
 #
-#   $Id: bash_completion,v 1.110 2002/02/13 19:20:59 ianmacd Exp $
+#   $Id: bash_completion,v 1.111 2002/02/13 19:23:52 ianmacd Exp $
 #
 #   Copyright (C) Ian Macdonald <ian@caliban.org>
 #
@@ -79,9 +79,7 @@ complete -A stopped -P '%' bg
 # other job commands
 complete -j -P '%' fg jobs disown
 
-# network commands complete with hostname
-complete -A hostname ssh rsh telnet rlogin ftp ping fping host traceroute \
-	    nslookup
+complete -F _known_hosts traceroute ping fping telnet host nslookup
 
 # export and others complete with shell variables
 complete -v readonly unset
@@ -1092,7 +1090,8 @@ _known_hosts()
 
 	return 0
 }
-complete -F _known_hosts traceroute ping fping telnet host nslookup
+complete -F _known_hosts traceroute ping fping telnet host nslookup rsh \
+			 rlogin ftp
 
 # ssh(1) completion. Should be able to improve this with user@host notation,
 # but the '@' seems to trigger some kind of bug in bash's completion.