diff --git a/debian/changelog b/debian/changelog
index 172df88..82a522d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 ubuntu-dev-tools (0.20) UNRELEASED; urgency=low
 
+  [ Cesare Tirabassi ]
   * suspicious-source: add *.hh to list of excluded files
   * suspicious-source: format excluded file list to fit 80 chars limit
   * suspicious-source: corrected typos in script and manual page
 
- -- Cesare Tirabassi <norsetto@ubuntu.com>  Sun, 21 Oct 2007 10:49:26 +0200
+  [ Laurent Bigonville ]
+  * pbuilder-dist: Use new --components options (LP: #140964)
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Mon, 22 Oct 2007 19:50:36 +0200
 
 ubuntu-dev-tools (0.19) gutsy; urgency=low
 
diff --git a/debian/control b/debian/control
index 77d70c6..11ddbd4 100644
--- a/debian/control
+++ b/debian/control
@@ -22,4 +22,4 @@ Description: useful tools for Ubuntu developers
  make their packaging work a lot easier. Such tools can include bug
  filing, packaging preparation, package analysis, etc.
  .
- Homepage: https://launchpad.net/ubuntu-dev-tools/
+  Homepage: https://launchpad.net/ubuntu-dev-tools/
diff --git a/pbuilder-dist b/pbuilder-dist
index df57be0..0120832 100755
--- a/pbuilder-dist
+++ b/pbuilder-dist
@@ -168,5 +168,5 @@ sudo pbuilder $OPERATION \
     $( [ -z $DEBCACHE ] || echo "--aptcache $DEBCACHE" ) \
     --buildresult $BASE_DIR/${FOLDERBASE}_result \
     --mirror "$ARCHIVE" \
-    --othermirror "deb $ARCHIVE $DISTRIBUTION $COMPONENTS" \
+    --components "$COMPONENTS" \
     $@