diff -Nru patch-2.7.6/debian/changelog patch-2.7.6/debian/changelog
--- patch-2.7.6/debian/changelog	2018-04-06 15:20:36.000000000 +0000
+++ patch-2.7.6/debian/changelog	2018-04-10 23:07:29.000000000 +0000
@@ -1,3 +1,9 @@
+patch (2.7.6-2ubuntu1) bionic; urgency=medium
+
+  * debian/patches/0001-Fix-ed-style-test-failure.patch: fix ed-style test.
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Tue, 10 Apr 2018 19:07:29 -0400
+
 patch (2.7.6-2) unstable; urgency=high
 
   * Backport patches from upstream Git tree:
diff -Nru patch-2.7.6/debian/control patch-2.7.6/debian/control
--- patch-2.7.6/debian/control	2018-04-06 15:20:36.000000000 +0000
+++ patch-2.7.6/debian/control	2018-04-10 23:07:29.000000000 +0000
@@ -1,7 +1,8 @@
 Source: patch
 Section: vcs
 Priority: standard
-Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org>
 Build-Depends: debhelper (>= 11), ed
 Standards-Version: 4.1.3
 Homepage: http://savannah.gnu.org/projects/patch/
diff -Nru patch-2.7.6/debian/patches/0001-Fix-ed-style-test-failure.patch patch-2.7.6/debian/patches/0001-Fix-ed-style-test-failure.patch
--- patch-2.7.6/debian/patches/0001-Fix-ed-style-test-failure.patch	1970-01-01 00:00:00.000000000 +0000
+++ patch-2.7.6/debian/patches/0001-Fix-ed-style-test-failure.patch	2018-04-10 23:06:34.000000000 +0000
@@ -0,0 +1,27 @@
+From 458ac51a05426c1af9aa6bf1342ecf60728c19b4 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Sat, 7 Apr 2018 12:34:03 +0200
+Subject: [PATCH] Fix 'ed-style' test failure.
+
+* tests/ed-style: Remove '?' line from expected output.
+---
+ tests/ed-style | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/tests/ed-style b/tests/ed-style
+index d8c0689..6b6ef9d 100644
+--- a/tests/ed-style
++++ b/tests/ed-style
+@@ -31,8 +31,7 @@ r !echo bar
+ ,p
+ EOF
+ 
+-check 'patch -e foo -i ed2.diff 2> /dev/null || echo "Status: $?"' <<EOF
+-?
++check 'patch -e foo -i ed2.diff > /dev/null 2> /dev/null || echo "Status: $?"' <<EOF
+ Status: 2
+ EOF
+ 
+-- 
+2.14.1
+
diff -Nru patch-2.7.6/debian/patches/series patch-2.7.6/debian/patches/series
--- patch-2.7.6/debian/patches/series	2018-04-06 15:20:36.000000000 +0000
+++ patch-2.7.6/debian/patches/series	2018-04-10 23:06:34.000000000 +0000
@@ -4,3 +4,4 @@
 Fix_segfault_with_mangled_rename_patch.patch
 Allow_input_files_to_be_missing_for_ed-style_patches.patch
 Fix_arbitrary_command_execution_in_ed-style_patches.patch
+0001-Fix-ed-style-test-failure.patch