diff --git a/bash_completion/pbuilder-dist b/bash_completion/pbuilder-dist
index cfe3b3d..423e284 100644
--- a/bash_completion/pbuilder-dist
+++ b/bash_completion/pbuilder-dist
@@ -30,6 +30,17 @@ _pbuilder-dist()
 
     return 0
 }
-[ "$have" ] && complete -F _pbuilder-dist -o filenames \
-{pbuilder,cowbuilder}-{dist,dapper,hardy,jaunty,karmic,lucid,maverick,natty,sarge,etch,lenny,squeeze,sid,experimental}
-# Make it pbuilder-* if you know how to do it
+[ "$have" ] && _pbuilder-aliases()
+{
+    local distro builder arch
+    for distro in $(ubuntu-distro-info --all; debian-distro-info --all) stable testing unstable experimental; do
+        for builder in pbuilder cowbuilder; do
+            echo "$builder-$distro"
+            for arch in i386 amd64 armel; do
+                echo "$builder-$distro-$arch"
+            done
+        done
+    done
+    return 0
+}
+[ "$have" ] && complete -F _pbuilder-dist -o filenames pbuilder-dist cowbuilder-dist $(_pbuilder-aliases)
diff --git a/debian/changelog b/debian/changelog
index f7376b0..75513d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ ubuntu-dev-tools (0.113) UNRELEASED; urgency=low
   [ Stefano Rivera ]
   * backportpackage: dput correct changes filename (regression in 0.112)
     (LP: #706010)
+  * bash_completion/pbuilder-dist: Use *-distro-info to determine pbuilder
+    file names.
 
- -- Benjamin Drung <bdrung@debian.org>  Sat, 22 Jan 2011 02:09:02 +0100
+ -- Stefano Rivera <stefanor@ubuntu.com>  Sat, 22 Jan 2011 15:17:15 +0200
 
 ubuntu-dev-tools (0.112) unstable; urgency=low