diff -Nru a2jmidid-8~dfsg0/debian/changelog a2jmidid-8~dfsg0/debian/changelog
--- a2jmidid-8~dfsg0/debian/changelog	2016-12-05 07:51:07.000000000 -0600
+++ a2jmidid-8~dfsg0/debian/changelog	2016-12-27 23:50:58.000000000 -0600
@@ -1,3 +1,13 @@
+a2jmidid (8~dfsg0-2.1ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian Sid (LP: #1652882). Remaining changes:
+    - debian/patches/arm64-sigsegv.patch: Disable NGREG check to fix FTBFS
+      on arm64.
+  * Dropped from the delta:
+    - debian/patches/ppc64-sigsegv.patch: Fix ppc64el build.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 27 Dec 2016 23:50:58 -0600
+
 a2jmidid (8~dfsg0-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -7,6 +17,15 @@
 
  -- Fernando Seiti Furusato <ferseiti@linux.vnet.ibm.com>  Mon, 05 Dec 2016 11:51:07 -0200
 
+a2jmidid (8~dfsg0-2ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/patches/ppc64-sigsegv.patch: Fix ppc64el build.
+    - debian/patches/arm64-sigsegv.patch: Disable NGREG check to fix FTBFS
+      on arm64.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 13 Nov 2016 19:18:37 -0800
+
 a2jmidid (8~dfsg0-2) unstable; urgency=medium
 
   * Team upload.
@@ -14,6 +33,21 @@
 
  -- Alessio Treglia <alessio@debian.org>  Tue, 01 Nov 2016 18:45:52 +0000
 
+a2jmidid (8~dfsg0-1ubuntu2) wily; urgency=medium
+
+  * No-change rebuild against libjack-jackd2-0v5
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 11 Aug 2015 06:29:50 +0000
+
+a2jmidid (8~dfsg0-1ubuntu1) vivid; urgency=medium
+
+  * debian/patches/ppc64-sigsegv.patch: Fix ppc64el build (pulled from Debian
+    #769141, thanks to Fernando Seiti Furusato).
+  * debian/patches/arm64-sigsegv.patch: Disable NGREG check to fix FTBFS on
+    arm64.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sat, 13 Dec 2014 03:58:06 -0500
+
 a2jmidid (8~dfsg0-1) unstable; urgency=low
 
   * New upstream release:
@@ -88,3 +122,4 @@
   * Initial Debian release. (Closes: #593734)
 
  -- Adrian Knoth <adi@drcomp.erfurt.thur.de>  Fri, 20 Aug 2010 17:08:30 +0200
+
diff -Nru a2jmidid-8~dfsg0/debian/control a2jmidid-8~dfsg0/debian/control
--- a2jmidid-8~dfsg0/debian/control	2016-12-05 07:51:07.000000000 -0600
+++ a2jmidid-8~dfsg0/debian/control	2016-12-27 23:49:17.000000000 -0600
@@ -1,7 +1,8 @@
 Source: a2jmidid
 Section: sound
 Priority: optional
-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
 Uploaders: Adrian Knoth <adi@drcomp.erfurt.thur.de>
 DM-Upload-Allowed: yes
 Build-Depends:
diff -Nru a2jmidid-8~dfsg0/debian/patches/arm64-sigsegv.patch a2jmidid-8~dfsg0/debian/patches/arm64-sigsegv.patch
--- a2jmidid-8~dfsg0/debian/patches/arm64-sigsegv.patch	1969-12-31 18:00:00.000000000 -0600
+++ a2jmidid-8~dfsg0/debian/patches/arm64-sigsegv.patch	2016-12-27 23:49:17.000000000 -0600
@@ -0,0 +1,13 @@
+Description: disable NGREG check on arm64
+Author: Logan Rosen <logan@ubuntu.com>
+--- a/sigsegv.c
++++ b/sigsegv.c
+@@ -91,7 +91,7 @@
+     a2j_error("info.si_errno = %d", info->si_errno);
+     a2j_error("info.si_code  = %d (%s)", info->si_code, si_codes[info->si_code]);
+     a2j_error("info.si_addr  = %p", info->si_addr);
+-#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__)
++#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__)
+     for(i = 0; i < NGREG; i++)
+         a2j_error("reg[%02d]       = 0x" REGFORMAT, i,
+ #if defined(__powerpc__) && !defined(__powerpc64__)
diff -Nru a2jmidid-8~dfsg0/debian/patches/series a2jmidid-8~dfsg0/debian/patches/series
--- a2jmidid-8~dfsg0/debian/patches/series	2016-12-05 07:51:07.000000000 -0600
+++ a2jmidid-8~dfsg0/debian/patches/series	2016-12-27 23:49:17.000000000 -0600
@@ -1,2 +1,3 @@
 shebangs.diff
 ppc64-sigsegv.patch
+arm64-sigsegv.patch