diff -Nru mksh-50d/debian/changelog mksh-50d/debian/changelog
--- mksh-50d/debian/changelog	2014-10-07 17:24:45.000000000 +0000
+++ mksh-50d/debian/changelog	2014-10-07 20:50:39.000000000 +0000
@@ -1,3 +1,11 @@
+mksh (50d-1ubuntu1) utopic; urgency=high
+
+  * Merge from Debian (LP: #1377295), remaining changes:
+    - Omit dietlibc builds on Ubuntu, where it is not in main
+    - Maintainer change for Ubuntu
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Tue, 07 Oct 2014 20:50:33 +0000
+
 mksh (50d-1) unstable; urgency=high
 
   * QA upload.
@@ -46,6 +54,14 @@
 
  -- Thorsten Glaser <tg@mirbsd.de>  Wed, 03 Sep 2014 22:30:55 +0200
 
+mksh (50-4ubuntu1) utopic; urgency=medium
+
+  * Merge from Debian (LP: #1362164), remaining changes:
+    - Omit dietlibc builds on Ubuntu, where it is not in main
+    - Enable klibc builds on arm64 and ppc64el
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Wed, 27 Aug 2014 14:54:34 +0200
+
 mksh (50-4) unstable; urgency=medium
 
   * The “Wollknäuel” upload, while preparing FrOSCon…
@@ -220,6 +236,25 @@
 
  -- Thorsten Glaser <tg@mirbsd.de>  Thu, 15 Aug 2013 00:15:42 +0200
 
+mksh (46-2ubuntu3) trusty; urgency=medium
+
+  * Enable klibc-based build on arm64 as well.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 23 Dec 2013 19:48:34 -0700
+
+mksh (46-2ubuntu2) trusty; urgency=low
+
+  * Enable klibc-based build on ppc64el as well.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Sun, 15 Dec 2013 22:41:02 -0700
+
+mksh (46-2ubuntu1) saucy; urgency=low
+
+  * Merge from Debian, Remaining changes:
+    - Do not build-depend on dietlibc, which is not in main.
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>  Mon, 03 Jun 2013 16:38:39 +0100
+
 mksh (46-2) unstable; urgency=low
 
   * The “Universal OS – freedom of choice” upload
diff -Nru mksh-50d/debian/control mksh-50d/debian/control
--- mksh-50d/debian/control	2014-10-07 17:24:24.000000000 +0000
+++ mksh-50d/debian/control	2014-10-07 20:49:59.000000000 +0000
@@ -1,7 +1,7 @@
 Source: mksh
 Section: shells
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 Homepage: http://mirbsd.de/mksh
 # We build-depend on dietlibc-dev and libklibc-dev for mksh-static and link
 # it against glibc if neither is usable for a given architecture. The meat
@@ -11,8 +11,8 @@
 # versioned B-D may be used to remove known bogus versions.)
 Build-Depends: bsdmainutils, debhelper (>= 5), ed,
   libklibc-dev [alpha amd64 arm64 armel armhf hppa i386 ia64 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32],
-  dietlibc-dev (>= 0.33~cvs20111108-5~) [hppa] | dietlibc-doc [hppa],
-  dietlibc-dev [alpha amd64 arm armeb armel armhf i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc sparc64],
+# dietlibc-dev (>= 0.33~cvs20111108-5~) [hppa] | dietlibc-doc [hppa],
+# dietlibc-dev [alpha amd64 arm armeb armel armhf i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc sparc64],
 # # also for the testsuite (could switch to C.UTF-8 nowadays, though)
   locales [!avr32] | belocs-locales-bin [!avr32]
 # # hard to test against bug