diff --git a/debian/changelog b/debian/changelog
index 772920f..f56405c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,9 @@ ubuntu-dev-tools (0.108) UNRELEASED; urgency=low
   [ Stefano Rivera ]
   * lp-shell, import-bug-from-debian:
     Use the 'production' LP instance instead of 'edge' (which is going away).
-  * pbuilder-dist: Fix typo in local archive support, introduced in 0.107.
+  * pbuilder-dist:
+    - Fix typo in local archive support, introduced in 0.107.
+    - Warn user if they run sudo pbuilder-dist (LP: #691999).
 
   [ Benjamin Drung ]
   * pull-lp-source: Unquote URI to get "+" instead of "%2B" in the file name
@@ -26,7 +28,7 @@ ubuntu-dev-tools (0.108) UNRELEASED; urgency=low
     --buildresult is specified.
   * sponsor-patch: Support building with pbuilder-dist.
 
- -- Benjamin Drung <bdrung@ubuntu.com>  Sat, 18 Dec 2010 12:57:29 +0100
+ -- Stefano Rivera <stefanor@ubuntu.com>  Sat, 18 Dec 2010 22:08:01 +0200
 
 ubuntu-dev-tools (0.107) experimental; urgency=low
 
diff --git a/pbuilder-dist b/pbuilder-dist
index b0f344b..ab3e658 100755
--- a/pbuilder-dist
+++ b/pbuilder-dist
@@ -89,6 +89,11 @@ class pbuilder_dist:
                                                       '~/pbuilder/'))
 
         if not os.path.isdir(self.base):
+            if 'SUDO_USER' in os.environ:
+                print >> stderr, ("Warning: pbuilder-dist running under sudo. "
+                                  "This is probably not what you want. "
+                                  "pbuilder-dist will use sudo itself, "
+                                  "when necessary.")
             try:
                 os.makedirs(self.base)
             except os.OSError: