diff --git a/bash_completion b/bash_completion
index 4b094392..e041a9fa 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1,6 +1,6 @@
 #   bash_completion - some programmable completion functions for bash 2.05b
 #
-#   $Id: bash_completion,v 1.483 2002/12/09 21:48:15 ianmacd Exp $
+#   $Id: bash_completion,v 1.484 2002/12/10 01:30:08 ianmacd Exp $
 #
 #   Copyright (C) Ian Macdonald <ian@caliban.org>
 #
@@ -1792,7 +1792,7 @@ _user_at_host() {
 
 	return 0
 }
-shopt -u hostcomplete && complete -F _user_at_host $nospace talk finger
+shopt -u hostcomplete && complete -F _user_at_host $nospace talk ytalk finger
 
 # This function performs host completion based on ssh's known_hosts files,
 # defaulting to standard host completion if they don't exist.
@@ -1882,8 +1882,8 @@ _known_hosts()
 
 	return 0
 }
-complete -F _known_hosts traceroute ping fping telnet host nslookup rsh \
-			 rlogin ftp
+complete -F _known_hosts traceroute traceroute6 tracepath tracepath6 \
+	ping fping telnet host nslookup rsh rlogin ftp
 
 # ssh(1) completion
 #
@@ -2361,7 +2361,8 @@ _command()
 
 	[ ${#COMPREPLY[@]} -eq 0 ] && _filedir
 }
-complete -F _command $filenames nohup exec nice eval strace time
+complete -F _command $filenames nohup exec nice eval strace time ltrace then \
+	 else do
 
 _root_command()
 {