diff --git a/bash_completion b/bash_completion
index 3084c9c8..9f8141e5 100644
--- a/bash_completion
+++ b/bash_completion
@@ -4692,7 +4692,7 @@ _java_packages()
 		fi
 	done
 	# keep only packages
-	COMPREPLY=( $( echo ${COMPREPLY[@]} | tr " " "\n" | grep "/$" ) )
+	COMPREPLY=( $( echo "${COMPREPLY[@]}" | tr " " "\n" | grep "/$" ) )
 	# remove packages extension
 	COMPREPLY=( ${COMPREPLY[@]%/} )
 	# convert path syntax to package syntax
diff --git a/debian/changelog b/debian/changelog
index 72e2913d..64e20fce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ bash-completion (20080617.4) UNRELEASED; urgency=low
                       addition to standard ones.
     - fixed _command() to correctly prune the command line
     - disabled completion of PostgreSQL users and databases
+    - fixed _java_packages()
 
- -- David Paleino <d.paleino@gmail.com>  Mon, 23 Jun 2008 11:45:52 +0200
+ -- David Paleino <d.paleino@gmail.com>  Mon, 23 Jun 2008 11:47:52 +0200
 
 bash-completion (20080617.3) unstable; urgency=low