diff -Nru lintian-2.3.1/checks/changelog-file lintian-2.3.1ubuntu1/checks/changelog-file
--- lintian-2.3.1/checks/changelog-file	2010-01-03 06:02:14.000000000 +0100
+++ lintian-2.3.1ubuntu1/checks/changelog-file	2010-01-03 15:20:50.000000000 +0100
@@ -255,7 +255,6 @@
 # such symlinks, so give the package a pass if the version number contains
 # ubuntu.
 if (-l 'changelog') {
-    tag 'debian-changelog-file-is-a-symlink' unless $version =~ /ubuntu/;
     return 0;
 }
 
diff -Nru lintian-2.3.1/debian/changelog lintian-2.3.1ubuntu1/debian/changelog
--- lintian-2.3.1/debian/changelog	2010-01-03 06:02:14.000000000 +0100
+++ lintian-2.3.1ubuntu1/debian/changelog	2010-01-03 15:21:53.000000000 +0100
@@ -1,3 +1,10 @@
+lintian (2.3.1ubuntu1) lucid; urgency=low
+
+  * Merge from Debian unstable (LP: #500870), remaining changes:
+    - Don't warn about a symlinked changelog file in Ubuntu due to CDBS.
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Sun, 03 Jan 2010 15:21:53 +0100
+
 lintian (2.3.1) unstable; urgency=low
 
   The "goodbye to unpack level 2" release.
@@ -385,6 +392,13 @@
 
  -- Russ Allbery <rra@debian.org>  Sat, 26 Dec 2009 18:38:10 -0800
 
+lintian (2.2.18ubuntu1) lucid; urgency=low
+
+  * Merge from Debian unstable (LP: #482796), remaining changes:
+    - Don't warn about a symlinked changelog file in Ubuntu.
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Sat, 14 Nov 2009 21:45:38 +0100
+
 lintian (2.2.18) unstable; urgency=low
 
   The "synchronize severities with ftpmaster's Lintian checks" release.
@@ -561,6 +575,19 @@
 
  -- Russ Allbery <rra@debian.org>  Thu, 12 Nov 2009 23:36:33 -0800
 
+lintian (2.2.17ubuntu2) lucid; urgency=low
+
+  * checks/lintian.desc, data/changelog-file/ubuntu-dists: Add lucid to the
+    list of known Ubuntu targets, and drop gutsy.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 09 Nov 2009 12:15:05 +0000
+
+lintian (2.2.17ubuntu1) karmic; urgency=low
+
+  * Don't warn about a symlinked changelog file in Ubuntu (LP: #329060).
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Tue, 22 Sep 2009 11:20:08 +0200
+
 lintian (2.2.17) unstable; urgency=medium
 
   * Urgency medium to beat libclass-accessor-perl into testing.
diff -Nru lintian-2.3.1/debian/control lintian-2.3.1ubuntu1/debian/control
--- lintian-2.3.1/debian/control	2010-01-03 06:02:14.000000000 +0100
+++ lintian-2.3.1ubuntu1/debian/control	2010-01-03 15:20:50.000000000 +0100
@@ -1,7 +1,8 @@
 Source: lintian
 Section: devel
 Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
 Uploaders: Josip Rodin <joy-packages@debian.org>,
  Jeroen van Wolffelaar <jeroen@wolffelaar.nl>,
  Frank Lichtenheld <djpig@debian.org>,