diff --git a/bash_completion b/bash_completion
index a1e02f92..2b6b0727 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.385 2002/07/22 20:08:53 ianmacd Exp $
+#   $Id: bash_completion,v 1.386 2002/07/23 15:59:15 ianmacd Exp $
 #
 #   Copyright (C) Ian Macdonald <ian@caliban.org>
 #
@@ -1149,11 +1149,11 @@ rpm_installed_packages()
 		/var/log/rpmpkgs -nt /var/lib/rpm/Packages ]; then
 		# using RHL 7.2 - this is quicker than querying the DB
 		COMPREPLY=( $( sed -ne \
-		's|^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.]\+.*\.rpm$|\1|p' \
+		's|^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.@]\+.*\.rpm$|\1|p' \
 				/var/log/rpmpkgs ) )
 	else
 		COMPREPLY=( $( rpm -qa | sed -ne \
-		's|^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.]\+$|\1|p' ) )
+		's|^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.@]\+$|\1|p' ) )
 	fi
 }
 
@@ -1643,7 +1643,7 @@ _user_at_host() {
 
 	return 0
 }
-complete -F _user_at_host $nospace talk finger
+shopt -u hostcomplete && complete -F _user_at_host $nospace talk finger
 
 # This function performs host completion based on ssh's known_hosts files,
 # defaulting to standard host completion if they don't exist.