diff -Nru emacs25-25.1+1/debian/changelog emacs25-25.1+1/debian/changelog
--- emacs25-25.1+1/debian/changelog	2016-10-25 15:43:32.000000000 +0000
+++ emacs25-25.1+1/debian/changelog	2017-03-28 22:58:12.000000000 +0000
@@ -1,3 +1,46 @@
+emacs25 (25.1+1-3ubuntu4) zesty; urgency=medium
+
+  * debian/rules: Add -O0 to CFLAGS on arm64 to prevent FTBFS due to
+    segfaults. (LP: #1656474)
+
+ -- Barry Warsaw <barry@ubuntu.com>  Tue, 28 Mar 2017 18:58:12 -0400
+
+emacs25 (25.1+1-3ubuntu3) zesty; urgency=medium
+
+  * debian/control.in:
+    - Don't build-depend on gconf. emacs has supported gsettings for years
+      (LP: #1669136) (Closes: #594346)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Thu, 02 Mar 2017 11:43:06 -0500
+
+emacs25 (25.1+1-3ubuntu2) zesty; urgency=medium
+
+  * Rebuild against new imagemagick 6.9.7.0.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 18 Jan 2017 13:16:25 +0100
+
+emacs25 (25.1+1-3ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - build with parallel=1 on arm64
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 02 Dec 2016 16:52:51 +0100
+
+emacs25 (25.1+1-3) unstable; urgency=medium
+
+  * Configure with REL_ALLOC=no to fix crashes.  Thanks to Santiago
+    Vila for reporting the problem, and Sean Whitton for helping test
+    the fix. (Closes: 842728)
+
+  * Disable xwidget (webkit) support.  Thanks to David Bremner for
+    reporting the issue. (Closes: 843462)
+
+  * Depend on liboss4-salsa-dev on hurd and kfreebsd.  Thanks to Aaron
+    M. Ucko for reporting the problem and Svante Signell for providing
+    the fix. (Closes: 840702)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Wed, 30 Nov 2016 18:15:33 -0600
+
 emacs25 (25.1+1-2ubuntu2) zesty; urgency=medium
 
   * Parallel=1 on arm64
diff -Nru emacs25-25.1+1/debian/control emacs25-25.1+1/debian/control
--- emacs25-25.1+1/debian/control	2016-10-25 15:43:35.000000000 +0000
+++ emacs25-25.1+1/debian/control	2017-03-28 22:58:12.000000000 +0000
@@ -1,7 +1,8 @@
 Source: emacs25
 Section: editors
 Priority: optional
-Maintainer: Rob Browning <rlb@defaultvalue.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Rob Browning <rlb@defaultvalue.org>
 Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev,
  dbus-x11,
  gnupg-agent,
@@ -14,10 +15,10 @@
  autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42),
  debhelper (>= 9), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev,
  libgnutls28-dev, libxml2-dev, libselinux1-dev [linux-any],
- libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  libmagick++-6.q16-dev,
- libwebkitgtk-3.0-dev,
  libacl1-dev,
+ liboss4-salsa-dev [hurd-i386 kfreebsd-i386 kfreebsd-amd64],
  zlib1g-dev
 Homepage: http://www.gnu.org/software/emacs/
 Standards-Version: 3.7.2
diff -Nru emacs25-25.1+1/debian/control.in emacs25-25.1+1/debian/control.in
--- emacs25-25.1+1/debian/control.in	2016-10-24 18:05:00.000000000 +0000
+++ emacs25-25.1+1/debian/control.in	2017-03-28 22:58:12.000000000 +0000
@@ -1,7 +1,8 @@
 Source: @DEB_FLAVOR@
 Section: editors
 Priority: optional
-Maintainer: Rob Browning <rlb@defaultvalue.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Rob Browning <rlb@defaultvalue.org>
 Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev,
  dbus-x11,
  gnupg-agent,
@@ -14,10 +15,10 @@
  autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42),
  debhelper (>= 9), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev,
  libgnutls28-dev, libxml2-dev, libselinux1-dev [linux-any],
- libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  libmagick++-6.q16-dev,
- libwebkitgtk-3.0-dev,
  libacl1-dev,
+ liboss4-salsa-dev [hurd-i386 kfreebsd-i386 kfreebsd-amd64],
  zlib1g-dev
 Homepage: http://www.gnu.org/software/emacs/
 Standards-Version: 3.7.2
diff -Nru emacs25-25.1+1/debian/rules emacs25-25.1+1/debian/rules
--- emacs25-25.1+1/debian/rules	2016-10-25 15:43:23.000000000 +0000
+++ emacs25-25.1+1/debian/rules	2017-03-28 22:58:12.000000000 +0000
@@ -115,6 +115,7 @@
 
 ifeq ($(DEB_HOST_ARCH),arm64)
   joblimit := 1
+  CFLAGS += -O0
 endif
 
 target := $(DEB_HOST_GNU_TYPE)
@@ -319,7 +320,6 @@
 # change the assignment below to --without-toolkit-scroll-bars.  The
 # resulting emacsXY package will have the old scrollbars.
 confflags_x += --with-toolkit-scroll-bars
-confflags_x += --with-xwidgets
 
 # nox configure flags
 confflags_nox := $(confflags) 
@@ -339,7 +339,10 @@
   rm -rf $(1)
   mkdir $(1)
   cp -a $$(ls -A | egrep -v '^(\.git|\.pc|debian)$$') "$(1)"
-  cd $(1) && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure $(confflags) $(2)
+  cd $(1) && \
+    CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
+    REL_ALLOC=no \
+      ./configure $(confflags) $(2)
 endef
 
 define build_cmd