diff -Nru gnubiff-2.2.17/debian/changelog gnubiff-2.2.17/debian/changelog
--- gnubiff-2.2.17/debian/changelog	2021-11-26 08:13:49.000000000 +0000
+++ gnubiff-2.2.17/debian/changelog	2022-02-20 22:45:03.000000000 +0000
@@ -1,8 +1,9 @@
-gnubiff (2.2.17-3ubuntu1) jammy; urgency=medium
+gnubiff (2.2.17-4) unstable; urgency=medium
 
-  * d/rules: force G++ to use C++14 (Closes: #984159)
+  * QA upload.
+  * Fix FTBFS with gcc-11 (Closes: #984159), patch by Simon Chopin.
 
- -- Simon Chopin <simon.chopin@canonical.com>  Fri, 26 Nov 2021 09:13:49 +0100
+ -- Adam Borowski <kilobyte@angband.pl>  Sun, 20 Feb 2022 23:45:03 +0100
 
 gnubiff (2.2.17-3) unstable; urgency=medium
 
diff -Nru gnubiff-2.2.17/debian/control gnubiff-2.2.17/debian/control
--- gnubiff-2.2.17/debian/control	2021-11-26 08:13:49.000000000 +0000
+++ gnubiff-2.2.17/debian/control	2021-01-31 23:15:57.000000000 +0000
@@ -1,8 +1,7 @@
 Source: gnubiff
 Section: mail
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: debhelper (>= 11),
                intltool,
                libaudiofile-dev,