diff -Nru bash-completion-1.3/debian/changelog bash-completion-1.3/debian/changelog
--- bash-completion-1.3/debian/changelog	2011-02-08 07:01:23.000000000 -0800
+++ bash-completion-1.3/debian/changelog	2011-03-20 05:57:57.000000000 -0700
@@ -1,3 +1,9 @@
+bash-completion (1:1.3-1ubuntu2) UNRELEASED; urgency=low
+
+  * Drop whitelists if they fail to produce any results (LP: #533985)
+
+ -- Clint Byrum <clint@ubuntu.com>  Sun, 20 Mar 2011 05:56:52 -0700
+
 bash-completion (1:1.3-1ubuntu1) natty; urgency=low
 
   * Merge from debian unstable. (LP: #715057) Remaining changes:
diff -Nru bash-completion-1.3/debian/patches/disable-whitelist-on-fail.patch bash-completion-1.3/debian/patches/disable-whitelist-on-fail.patch
--- bash-completion-1.3/debian/patches/disable-whitelist-on-fail.patch	1969-12-31 16:00:00.000000000 -0800
+++ bash-completion-1.3/debian/patches/disable-whitelist-on-fail.patch	2011-03-20 06:00:50.000000000 -0700
@@ -0,0 +1,20 @@
+Author: Clint Byrum <clint@ubuntu.com>
+Subject: disable whitelists when they fail to produce results
+Bug-Ubuntu: https://launchpad.net/bugs/533985
+
+Index: bash-completion-1.3/bash_completion
+===================================================================
+--- bash-completion-1.3.orig/bash_completion	2011-03-20 05:36:36.717277995 -0700
++++ bash-completion-1.3/bash_completion	2011-03-20 05:56:15.748086091 -0700
+@@ -661,6 +661,11 @@
+     fi
+     [ ${#toks[@]} -ne 0 ] && _compopt_o_filenames
+ 
++    # If the filter failed to produce anything, try w/o it (LP: #533985)
++    if [[ -n "$1" ]] && [[ "$1" != -d ]] && [[ ${#toks[@]} -lt 1 ]] ; then
++       toks=( ${toks[@]-} $( compgen -f -X -- $quoted) )
++    fi
++
+     COMPREPLY=( "${COMPREPLY[@]}" "${toks[@]}" )
+ } # _filedir()
+ 
diff -Nru bash-completion-1.3/debian/patches/series bash-completion-1.3/debian/patches/series
--- bash-completion-1.3/debian/patches/series	2011-02-08 06:52:30.000000000 -0800
+++ bash-completion-1.3/debian/patches/series	2011-03-20 05:36:29.000000000 -0700
@@ -1,2 +1,3 @@
 disable-avahi-browse.diff
 apt-get-changelog.patch
+disable-whitelist-on-fail.patch