diff --git a/debian/changelog b/debian/changelog
index d6825cb..410482c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ubuntu-dev-tools (0.21) UNRELEASED; urgency=low
   [ Laurent Bigonville ]
   * debian/control: add a space before the Homepage pseudo-field
   * pbuilder-dist: add hardy to the distribution list
+  * pbuilder-dist: Use new --components options (LP: #140964)
+  * pbuilder-dist: Add an empty --othermirror to override config in pbuilderrc
 
   [ Kees Cook ]
   * mk-sbuild-lv: fix gnupg install, adjust symlink creation
diff --git a/pbuilder-dist b/pbuilder-dist
index 4e89c6e..1b65b47 100755
--- a/pbuilder-dist
+++ b/pbuilder-dist
@@ -168,5 +168,6 @@ sudo pbuilder $OPERATION \
     $( [ -z $DEBCACHE ] || echo "--aptcache $DEBCACHE" ) \
     --buildresult $BASE_DIR/${FOLDERBASE}_result \
     --mirror "$ARCHIVE" \
-    --othermirror "deb $ARCHIVE $DISTRIBUTION $COMPONENTS" \
+    --othermirror "" \
+    --components "$COMPONENTS" \
     $@