diff --git a/bash_completion b/bash_completion
index b6d529ed..9283e23b 100644
--- a/bash_completion
+++ b/bash_completion
@@ -4666,8 +4666,10 @@ _java_find_sourcepath()
 	done
 
 	# default to classpath
-	[ -z "$sourcepath" ] && _java_find_classpath
-	sourcepath=$classpath
+	if [ -z "$sourcepath" ]; then
+		_java_find_classpath
+		sourcepath=$classpath
+	fi
 }
 
 # available classes completion
diff --git a/debian/changelog b/debian/changelog
index 833f603f..a7142f58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -121,6 +121,7 @@ bash-completion (200902xx) UNRELEASED; urgency=low
   * Remove duplicate cpio completion, thanks to Freddy Vulto (Closes: #512823)
   * Fix awk error in "modprobe -r /" completion (Closes: #512556).
   * Expand ~foo to dir name more eagerly to avoid quoting issues.
+  * Fix -sourcepath handling in javadoc packages completion.
 
   [ Freddy Vulto ]
   * Restored `_display()' completion for `display' by removing