diff --git a/bash_completion/pbuilder-dist b/bash_completion/pbuilder-dist
index 0eb20d0..af9ddc1 100644
--- a/bash_completion/pbuilder-dist
+++ b/bash_completion/pbuilder-dist
@@ -31,5 +31,5 @@ _pbuilder-dist()
     return 0
 }
 [ "$have" ] && complete -F _pbuilder-dist -o filenames \
-pbuilder-{dist,dapper,edgy,feisty,gutsy,hardy,intrepid,sarge,etch,lenny,sid}
+{pbuilder,cowbuilder}-{dist,dapper,edgy,feisty,gutsy,hardy,intrepid,jaunty,sarge,etch,lenny,sid}
 # Make it pbuilder-* if you know how to do it
diff --git a/debian/changelog b/debian/changelog
index 36d866d..d0b65e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
 ubuntu-dev-tools (0.63) UNRELEASED; urgency=low
 
   * debian/links: add it (forgot to do so before).
+  * bash-completion/pbuilder-dist: recognize cowbuilder- and -jaunty.
+  * pbuilder-dist:
+     - Fixed a bug which broke pbuilder-dist when "build" was omited; just
+       giving a .dsc works now.
+     - {p,cow}builder-dist will now complain if you try to build a .changes
+       file (or anything else that isn't a .dsc).
 
  -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>  Thu, 05 Feb 2009 16:19:03 +0100
 
diff --git a/pbuilder-dist b/pbuilder-dist
index aed0cd3..52aace9 100755
--- a/pbuilder-dist
+++ b/pbuilder-dist
@@ -149,6 +149,7 @@ class pbuilder_dist:
 			if operation.endswith('.dsc'):
 				if os.path.isfile(operation):
 					self.operation = 'build'
+					return operation
 				else:
 					print 'Error: Could not find file «%s».' % operation
 					sys.exit(1)
@@ -158,6 +159,7 @@ class pbuilder_dist:
 				sys.exit(1)
 		else:
 			self.operation = operation
+			return ''
 	
 	def get_command(self, remaining_arguments = None):
 		""" pbuilder_dist.get_command -> string
@@ -327,7 +329,11 @@ def main():
 		help(1)
 	
 	# Parse the operation
-	app.set_operation(args.pop(0))
+	args = [app.set_operation(args.pop(0))] + args
+	
+	if app.operation == 'build' and not '.dsc' in ' '.join(args):
+		print 'Error: You have to specify a .dsc file if you want to build.'
+		sys.exit(1)
 	
 	# Execute the pbuilder command
 	sys.exit(os.system(app.get_command(args)))