diff --git a/bash_completion b/bash_completion
index 1a947f71..731af2de 100644
--- a/bash_completion
+++ b/bash_completion
@@ -23,7 +23,7 @@
 #
 #   http://bash-completion.alioth.debian.org/
 #
-#   RELEASE: 20080617.2
+#   RELEASE: 20080617.3
 
 if [[ $- == *v* ]]; then
 	BASH_COMPLETION_ORIGINAL_V_VALUE="-v"
@@ -3244,7 +3244,7 @@ _command()
 			if [[ ${#COMP_WORDS[@]} -ge 2 ]]; then
 				$func $cmd "${COMP_WORDS[${#COMP_WORDS[@]}-1]}" "${COMP_WORDS[${#COMP_WORDS[@]}-2]}"
 			else
-				$func $cmd "${COMP_WORDS[${#COMP_WORDS[@]}-1}}"
+				$func $cmd "${COMP_WORDS[${#COMP_WORDS[@]}-1]}"
 			fi
 
 			# remove any \: generated by a command that doesn't
@@ -9364,16 +9364,17 @@ _svnlook()
 	return 0
 }
 complete -F _svnlook $default svnlook
+}
 
+have rrdtool &&
 _rrdtool ()
 {
 	cur=`_get_cword`
 	COMPREPLY=( $( compgen -W 'create update updatev graph dump \
 	                           restore last lastupdate first info \
 	                           fetch tune resize xport' -- $cur ) )
-}
+} &&
 complete -F _rrdtool rrdtool
-}
 
 _filedir_xspec()
 {
@@ -9400,7 +9401,7 @@ _filedir_xspec()
 
 	while read -r tmp; do
 		[[ -n $tmp ]] && toks[${#toks[@]}]=$tmp
-	done < <( compgen -f -X $xspec -- "\$(quote_readline "\$cur")" )	
+	done < <( eval compgen -f -X $xspec -- "\$(quote_readline "\$cur")" )	
 	
 	COMPREPLY=( "${toks[@]}" )
 }