diff --git a/debian/changelog b/debian/changelog
index 51bd934..15b478c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ ubuntu-dev-tools (0.107) UNRELEASED; urgency=low
     - Correct typo in options --wrap-allways -> --wrap-always
     - Sort debian/install as well as debian/*.install
     - Add one-space-indentation option: --short-indent
+    - Remove null-entry from trailing comma in sorted lists
 
- -- Stefano Rivera <stefanor@ubuntu.com>  Wed, 24 Nov 2010 19:15:28 +0200
+ -- Stefano Rivera <stefano@rivera.za.net>  Wed, 24 Nov 2010 19:19:49 +0200
 
 ubuntu-dev-tools (0.106) experimental; urgency=low
 
diff --git a/wrap-and-sort b/wrap-and-sort
index 14fc7df..2e3299b 100755
--- a/wrap-and-sort
+++ b/wrap-and-sort
@@ -67,6 +67,9 @@ class Control(object):
         packages = map(lambda x: x.strip(), control[entry].split(","))
         if sort:
             packages = sort_list(packages)
+            # Not explicitly disallowed by Policy but known to break QA tools:
+            if "" in packages:
+                packages.remove("")
 
         lenght = len(entry) + 2 * len(packages) + sum(map(len, packages))
         if wrap_always or lenght > 80: