diff --git a/bash_completion/pbuilder-dist b/bash_completion/pbuilder-dist
index 3011775..0eb20d0 100644
--- a/bash_completion/pbuilder-dist
+++ b/bash_completion/pbuilder-dist
@@ -30,4 +30,6 @@ _pbuilder-dist()
 
     return 0
 }
-[ "$have" ] && complete -F _pbuilder-dist -o filenames pbuilder-dist
+[ "$have" ] && complete -F _pbuilder-dist -o filenames \
+pbuilder-{dist,dapper,edgy,feisty,gutsy,hardy,intrepid,sarge,etch,lenny,sid}
+# Make it pbuilder-* if you know how to do it
diff --git a/debian/changelog b/debian/changelog
index 8e6810b..0e087b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 ubuntu-dev-tools (0.30) UNRELEASED; urgency=low
 
+  [ Siegfried-Angel Gevatter Pujals (RainCT) ]
   * pbuilder-dist-simple, doc/pbuilder-dist-simple.1, setup.py:
      - Add the original pbuilder-dist script as pbuilder-dist-simple.
   * pbuilder-dist:
@@ -7,7 +8,13 @@ ubuntu-dev-tools (0.30) UNRELEASED; urgency=low
   * setup.py:
      - Really install reverse-build-depends (LP: #203523).
 
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com>  Wed, 12 Mar 2008 00:42:55 +0100
+  [ Adrien Cunin ]
+  * debian/ubuntu-dev-tools.install: install bash_completion/pbuilder-dist in
+    /etc/bash_completion.d/ instead of /etc/bash_completion.d/pbuilder-dist/
+  * bash_completion/pbuilder-dist: apply the completion not only to
+    pbuilder-dist but also to pbuilder-{hardy,sid,etc.}
+
+ -- Adrien Cunin <adri2000@ubuntu.com>  Sun, 23 Mar 2008 21:51:28 +0100
 
 ubuntu-dev-tools (0.29) hardy; urgency=low
 
diff --git a/debian/ubuntu-dev-tools.install b/debian/ubuntu-dev-tools.install
index 635757e..40fadd6 100644
--- a/debian/ubuntu-dev-tools.install
+++ b/debian/ubuntu-dev-tools.install
@@ -1 +1 @@
-bash_completion/* etc/bash_completion.d/pbuilder-dist
+bash_completion/* etc/bash_completion.d/