diff -Nru /tmp/Lo580dbTdz/lintian-1.23.31ubuntu1/checks/lintian.desc /tmp/0Rq9vUGG7o/lintian-1.23.31ubuntu2/checks/lintian.desc
--- /tmp/Lo580dbTdz/lintian-1.23.31ubuntu1/checks/lintian.desc	2007-02-27 06:57:07.000000000 +0100
+++ /tmp/0Rq9vUGG7o/lintian-1.23.31ubuntu2/checks/lintian.desc	2007-06-12 15:38:28.000000000 +0200
@@ -9,6 +9,15 @@
  in the control file of the package by the package build tools.
 Ref: policy 5.5
 
+Tag: bad-ubuntu-distribution-in-changes-file
+Type: error
+Info: You've specified an unknown `target distribution' for your upload in
+ the <tt>debian/changelog</tt> file.
+ .
+ Your version string suggests this package is for Ubuntu, so your
+ distribution should be one of gutsy, feisty, edgy, dapper, breezy, hoary
+ or warty.
+
 Tag: bad-distribution-in-changes-file
 Type: error
 Info: You've specified an unknown `target distribution' for your upload in
diff -Nru /tmp/Lo580dbTdz/lintian-1.23.31ubuntu1/debian/changelog /tmp/0Rq9vUGG7o/lintian-1.23.31ubuntu2/debian/changelog
--- /tmp/Lo580dbTdz/lintian-1.23.31ubuntu1/debian/changelog	2007-06-07 22:02:25.000000000 +0200
+++ /tmp/0Rq9vUGG7o/lintian-1.23.31ubuntu2/debian/changelog	2007-06-12 13:44:12.000000000 +0200
@@ -1,3 +1,9 @@
+lintian (1.23.31ubuntu2) gutsy; urgency=low
+
+  * If version contains "ubuntu", only accept Ubuntu distributions.
+
+ -- Soren Hansen <soren@ubuntu.com>  Tue, 12 Jun 2007 13:43:51 +0200
+
 lintian (1.23.31ubuntu1) gutsy; urgency=low
 
   * Resynchronise with Debian. Remaining changes:
diff -Nru /tmp/Lo580dbTdz/lintian-1.23.31ubuntu1/frontend/lintian /tmp/0Rq9vUGG7o/lintian-1.23.31ubuntu2/frontend/lintian
--- /tmp/Lo580dbTdz/lintian-1.23.31ubuntu1/frontend/lintian	2007-06-07 22:02:25.000000000 +0200
+++ /tmp/0Rq9vUGG7o/lintian-1.23.31ubuntu2/frontend/lintian	2007-06-12 20:45:45.000000000 +0200
@@ -636,26 +636,25 @@
 	    }
 
 	    # check distribution field
-	    if (defined $data->{distribution}
-                and ! (($data->{distribution} eq 'stable')
+	    if (defined $data->{distribution}) {
+		if ($data->{'version'} =~ /ubuntu/) {
+		    if ( $data->{distribution} !~ /^(gutsy|feisty|edgy|dapper|breezy|hoary|warty)(-(proposed(-updates)?|updates|backports|security))?$/ ) {
+			tag("bad-ubuntu-distribution-in-changes-file",
+			    $data->{distribution});
+		    }
+		} else {
+		    if (! (($data->{distribution} eq 'stable')
                        or ($data->{distribution} eq 'testing')
                        or ($data->{distribution} eq 'unstable')
                        or ($data->{distribution} eq 'experimental')
-                       or ($data->{distribution} eq 'gutsy')
-                       or ($data->{distribution} eq 'feisty')
-                       or ($data->{distribution} eq 'edgy')
-                       or ($data->{distribution} eq 'dapper')
-                       or ($data->{distribution} eq 'breezy')
-                       or ($data->{distribution} eq 'hoary')
-                       or ($data->{distribution} eq 'warty')
-                       or ($data->{distribution} =~ /\w+-proposed(?:-updates)?/)
-                       or ($data->{distribution} =~ /\w+-updates/)
-                       or ($data->{distribution} =~ /\w+-backports/)
+                       or ($data->{distribution} =~ /\w+-proposed-updates/)
                        or ($data->{distribution} =~ /\w+-security/))
-               ) {
-		# bad distribution entry
-		tag("bad-distribution-in-changes-file",
-		    $data->{distribution});
+		    ) {
+			# bad distribution entry
+			tag("bad-distribution-in-changes-file",
+			    $data->{distribution});
+		    }
+		}
 	    }
 
 	    # Urgency is only recommended by Policy.