diff --git a/debian/changelog b/debian/changelog
index 2e32db9..ad5301b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,11 @@ ubuntu-dev-tools (0.76) UNRELEASED; urgency=low
   * requestsync: Guard some calls when -n is specified
   * suspicious-source: Add *.hs *.el *.css to whitelist
 
- -- Iain Lane <laney@ubuntu.com>  Sat, 08 Aug 2009 16:02:25 +0100
+  [ Siegfried-Angel Gevatter Pujals ]
+  * pbuilder-dist:
+     - Expand "~" in PBUILDFOLDER to the user's home directory.
+
+ -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>  Sun, 16 Aug 2009 00:11:09 +0200
 
 ubuntu-dev-tools (0.75) karmic; urgency=low
 
diff --git a/pbuilder-dist b/pbuilder-dist
index c9ff8d0..9bb64ee 100755
--- a/pbuilder-dist
+++ b/pbuilder-dist
@@ -85,10 +85,7 @@ class pbuilder_dist:
 		
 		##############################################################
 		
-		if 'PBUILDFOLDER' in os.environ:
-			self.base = os.environ['PBUILDFOLDER']
-		else:
-			self.base = os.path.expanduser('~/pbuilder/')
+		self.base = os.path.expanduser(os.environ.get('PBUILDFOLDER', '~/pbuilder/'))
 
 		if not os.path.exists(self.base):
 			os.makedirs(self.base)