diff --git a/bash_completion b/bash_completion
index 827df70c..3369e037 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.353 2002/06/09 17:22:26 ianmacd Exp $
+#   $Id: bash_completion,v 1.354 2002/06/10 15:36:50 ianmacd Exp $
 #
 #   Copyright (C) Ian Macdonald <ian@caliban.org>
 #
@@ -25,7 +25,7 @@
 # Alter the following to reflect the location of this file
 #
 declare -r BASH_COMPLETION=${BASH_COMPLETION:-/etc/bash_completion}
-declare -r BASH_COMPLETION_DIR=${BASH_COMPLETION_DIR:=/etc/bash_completion}
+declare -r BASH_COMPLETION_DIR=${BASH_COMPLETION_DIR:=/etc/bash_completion.d}
 
 # Set a couple of useful vars
 #
@@ -1949,8 +1949,8 @@ _tar()
 		# devise how to untar and list it
 		untar=t${COMP_WORDS[1]//[^Izjyf]/}
 
-		COMPREPLY=( $( compgen -W "$( tar $untar $tar 2>/dev/null )" \
-				-- "$cur" ) )
+		COMPREPLY=( $( compgen -W "$( echo $( tar $untar $tar \
+				2>/dev/null ) )" -- "$cur" ) )
 
 	fi