diff -u balsa-2.3.16/debian/control balsa-2.3.16/debian/control
--- balsa-2.3.16/debian/control
+++ balsa-2.3.16/debian/control
@@ -1,7 +1,8 @@
 Source: balsa
 Section: gnome
 Priority: optional
-Maintainer: Andrew Lau <netsnipe@users.sourceforge.net>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Andrew Lau <netsnipe@users.sourceforge.net>
 Build-Depends: autotools-dev,
                cdbs,
                debhelper (>= 5.0),
diff -u balsa-2.3.16/debian/rules balsa-2.3.16/debian/rules
--- balsa-2.3.16/debian/rules
+++ balsa-2.3.16/debian/rules
@@ -25,0 +26,5 @@
+
+# Ensure that .gmo files are gone before package building
+cleanbuilddir/balsa::
+	rm -f po/*.gmo
+	rm -f balsa.desktop
diff -u balsa-2.3.16/debian/changelog balsa-2.3.16/debian/changelog
--- balsa-2.3.16/debian/changelog
+++ balsa-2.3.16/debian/changelog
@@ -1,3 +1,11 @@
+balsa (2.3.16-1ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - remove .gmo files and .desktop file during clean call
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Mon, 04 Jun 2007 23:42:30 +0200
+
 balsa (2.3.16-1) unstable; urgency=low
 
   * New upstream release, fixing bugs
@@ -6,6 +14,14 @@
 
  -- Alan Baghumian <alan@technotux.org>  Wed, 30 May 2007 14:06:53 +0330
 
+balsa (2.3.15-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - remove .gmo files and .desktop file during clean call
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Sat, 19 May 2007 15:29:22 +0200
+
 balsa (2.3.15-1) unstable; urgency=low
 
   [ Alan Baghumian ]
@@ -37,6 +53,14 @@
 
  -- Alan Baghumian <alan@technotux.org>  Tue, 15 May 2007 14:11:04 +0330
 
+balsa (2.3.13-2ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable.
+  * Remaining changes:
+    - remove .gmo files and .desktop file during clean call
+	
+ -- Andrew Mitchell <ajmitch@ubuntu.com>  Wed,  6 Dec 2006 11:25:12 +1300
+
 balsa (2.3.13-2) unstable; urgency=low
 
   * Rebuild against libgmime-2.0-2-dev which supersedes libgmime2.1-dev.
@@ -44,6 +68,31 @@
 
  -- Loic Minier <lool@dooz.org>  Thu, 17 Aug 2006 18:41:48 +0200
 
+balsa (2.3.13-1ubuntu4) edgy; urgency=low
+
+  * s/libgmime2.0-2-dev/libgmime-2.0-2-dev
+
+ -- Brandon Hale <brandon@ubuntu.com>  Mon,  4 Sep 2006 07:51:22 -0400
+
+balsa (2.3.13-1ubuntu3) edgy; urgency=low
+
+  * Actually save the changes to debian/control
+
+ -- Brandon Hale <brandon@ubuntu.com>  Fri,  1 Sep 2006 18:13:23 -0400
+
+balsa (2.3.13-1ubuntu2) edgy; urgency=low
+
+  * Rebuild against gmime2.2
+
+ -- Brandon Hale <brandon@ubuntu.com>  Fri,  1 Sep 2006 17:56:19 -0400
+
+balsa (2.3.13-1ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable: 
+     - remove .gmo files and .desktop file during clean call
+
+ -- Gauvain Pocentek <gauvainpocentek@ubuntu.com>  Tue, 01 Aug 2006 03:18:41 +0100
+
 balsa (2.3.13-1) unstable; urgency=low
 
   * New upstream release.
@@ -63,6 +112,14 @@
 
  -- Oystein Gisnas <oystein@gisnas.net>  Mon, 31 Jul 2006 11:36:55 +0200
 
+balsa (2.3.8-3ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+  * Drop 25_gnome_goption_cvs.patch (replaced with 00_popt_goption.patch)
+  * Make sure that balsa.desktop is removed when cleaning
+
+ -- Gauvain Pocentek <gauvainpocentek@ubuntu.com>  Fri, 30 Jun 2006 18:27:58 +0100
+
 balsa (2.3.8-3) unstable; urgency=low
 
   * debian/patches/00_popt_goption.patch:
@@ -77,6 +134,28 @@
 
  -- Andrew Lau <netsnipe@users.sourceforge.net>  Tue, 10 Jan 2006 19:47:41 +1100
 
+balsa (2.3.8-1ubuntu3) dapper; urgency=low
+
+  * Rebuild to call dh_iconcache
+
+ -- Gauvain Pocentek <gauvainpocentek@ubuntu.com>  Wed, 24 May 2006 07:54:25 +0200
+
+balsa (2.3.8-1ubuntu2) dapper; urgency=low
+
+  * debian/rules:
+    + Ensure that .gmo files are removed at net build.
+  * debian/patches:
+    + Add 25_gnome_goption_cvs.patch in attempt to fix malone #38619 taken
+      from CVS commits of src/main.c rev. 1.196 and src/ab-main.c rev. 1.20 .
+
+ -- Zak B. Elep <zakame@ubuntu.com>  Mon, 10 Apr 2006 05:18:15 -0400
+
+balsa (2.3.8-1ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Daniel T Chen <crimsun@fungus.sh.nu>  Mon, 09 Jan 2006 12:46:44 +0000
+
 balsa (2.3.8-1) unstable; urgency=low
 
   [ Andrew Lau ]
@@ -101,6 +180,12 @@
 
  -- Debian/i386 Build Daemon <buildd_i386-cyberhq>  Mon, 28 Nov 2005 02:39:55 -0800
 
+balsa (2.3.4-3ubuntu1) dapper; urgency=low
+
+  * rebuild for c++ transition (libpcre3-dev)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Nov 2005 14:40:50 +0100
+
 balsa (2.3.4-3) unstable; urgency=low
 
   * Rebuild against openssl >= 0.9.8-1 for the new soname (libssl0.9.8).
@@ -714,0 +800 @@
+
diff -u balsa-2.3.16/debian/control.in balsa-2.3.16/debian/control.in
--- balsa-2.3.16/debian/control.in
+++ balsa-2.3.16/debian/control.in
@@ -1,7 +1,8 @@
 Source: balsa
 Section: gnome
 Priority: optional
-Maintainer: Andrew Lau <netsnipe@users.sourceforge.net>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Andrew Lau <netsnipe@users.sourceforge.net>
 Build-Depends: autotools-dev,
                cdbs,
                debhelper (>= 5.0),