diff -Nru module-assistant-0.11.3/debian/changelog module-assistant-0.11.3ubuntu1/debian/changelog
--- module-assistant-0.11.3/debian/changelog	2010-01-27 06:53:31.000000000 +0530
+++ module-assistant-0.11.3ubuntu1/debian/changelog	2010-06-15 20:27:07.000000000 +0530
@@ -1,3 +1,10 @@
+module-assistant (0.11.3ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable.  Remaining changes: LP: #594668
+    - fglrx-kernel-src -> fglrx-kernel-source.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Tue, 15 Jun 2010 20:25:17 +0530
+
 module-assistant (0.11.3) unstable; urgency=low
 
   * New upstream release.
@@ -68,6 +75,13 @@
 
  -- Cyril Brulebois <kibi@debian.org>  Wed, 27 Jan 2010 02:22:36 +0100
 
+module-assistant (0.11.2ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing (LP: #509146). Remaining changes:
+    - fglrx-kernel-src -> fglrx-kernel-source.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Mon, 18 Jan 2010 19:15:43 +0530
+
 module-assistant (0.11.2) unstable; urgency=low
 
   * New maintenance release.
@@ -111,6 +125,13 @@
 
  -- Cyril Brulebois <kibi@debian.org>  Fri, 08 Jan 2010 04:36:01 +0100
 
+module-assistant (0.11.1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #311100
+    - fglrx-kernel-src -> fglrx-kernel-source.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Thu, 11 Jun 2009 12:33:16 +0530
+
 module-assistant (0.11.1) unstable; urgency=low
 
   * New maintenance release.
@@ -175,6 +196,12 @@
 
  -- Sean Finney <seanius@debian.org>  Thu, 17 Jan 2008 21:14:15 +0100
 
+module-assistant (0.10.11ubuntu1) hardy; urgency=low
+
+  * fglrx-kernel-src -> fglrx-kernel-source (LP: #70059)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 07 Feb 2008 20:46:47 +0200
+
 module-assistant (0.10.11) unstable; urgency=medium
 
   * Updated the Makefile list for the languages (sorry translators)
+
diff -Nru module-assistant-0.11.3/debian/control module-assistant-0.11.3ubuntu1/debian/control
--- module-assistant-0.11.3/debian/control	2010-01-27 06:53:31.000000000 +0530
+++ module-assistant-0.11.3ubuntu1/debian/control	2010-02-07 11:48:06.000000000 +0530
@@ -1,7 +1,8 @@
 Source: module-assistant
 Section: kernel
 Priority: optional
-Maintainer: Eduard Bloch <blade@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Eduard Bloch <blade@debian.org>
 Uploaders: Cyril Brulebois <kibi@debian.org>
 Build-Depends: debhelper (>= 7), bzip2, gettext, docbook-utils
 Standards-Version: 3.8.1
diff -Nru module-assistant-0.11.3/modass/compliant.list module-assistant-0.11.3ubuntu1/modass/compliant.list
--- module-assistant-0.11.3/modass/compliant.list	2010-01-27 06:53:31.000000000 +0530
+++ module-assistant-0.11.3ubuntu1/modass/compliant.list	2010-02-07 11:48:06.000000000 +0530
@@ -10,7 +10,7 @@
 drbd0.7-module-source
 em8300-source
 exmap-modules-source
-fglrx-kernel-src
+fglrx-kernel-source
 freeswan-modules-source
 gpib-modules-source
 ivtv-source