diff -u gpsk31-0.4.1/debian/control gpsk31-0.4.1/debian/control
--- gpsk31-0.4.1/debian/control
+++ gpsk31-0.4.1/debian/control
@@ -1,7 +1,8 @@
 Source: gpsk31
 Section: hamradio
 Priority: optional
-Maintainer: Joop Stakenborg <pa3aba@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Joop Stakenborg <pa3aba@debian.org>
 Uploaders: Joop Stakenborg <pa3aba@debian.org>, Carlos Barros <cbf@debian.org>
 Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, autotools-dev
 Standards-Version: 3.7.3
diff -u gpsk31-0.4.1/debian/changelog gpsk31-0.4.1/debian/changelog
--- gpsk31-0.4.1/debian/changelog
+++ gpsk31-0.4.1/debian/changelog
@@ -1,3 +1,12 @@
+gpsk31 (0.4.1-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Rebuild for ldbl128 change (powerpc, sparc).
+    - Set Ubuntu maintainer address.
+  * Updated XSBC-Original-Maintainer Field
+
+ -- Nathan Handler <mrcheatr@gmail.com>  Thu, 08 May 2008 20:40:02 -0500
+
 gpsk31 (0.4.1-1) unstable; urgency=low
 
   * New upstream release.
@@ -19,6 +28,13 @@
 
  -- Joop Stakenborg <pa3aba@debian.org>  Mon, 25 Feb 2008 21:29:36 +0100
 
+gpsk31 (0.3-1ubuntu1) feisty; urgency=low
+
+  * Rebuild for ldbl128 change (powerpc, sparc).
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu,  1 Mar 2007 22:37:46 +0000
+
 gpsk31 (0.3-1) unstable; urgency=low
 
   * New upstream version, closes: #363560.
@@ -94,0 +111 @@
+