diff -pruN 2.2.17-3/debian/changelog 2.2.17-4/debian/changelog
--- 2.2.17-3/debian/changelog	2021-01-31 23:16:07.000000000 +0000
+++ 2.2.17-4/debian/changelog	2022-02-20 22:45:03.000000000 +0000
@@ -1,3 +1,10 @@
+gnubiff (2.2.17-4) unstable; urgency=medium
+
+  * QA upload.
+  * Fix FTBFS with gcc-11 (Closes: #984159), patch by Simon Chopin.
+
+ -- Adam Borowski <kilobyte@angband.pl>  Sun, 20 Feb 2022 23:45:03 +0100
+
 gnubiff (2.2.17-3) unstable; urgency=medium
 
   * QA upload.
diff -pruN 2.2.17-3/debian/rules 2.2.17-4/debian/rules
--- 2.2.17-3/debian/rules	2018-10-16 22:37:55.000000000 +0000
+++ 2.2.17-4/debian/rules	2022-02-20 22:44:50.000000000 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+export DEB_CXXFLAGS_MAINT_APPEND=-std=c++14
 %:
 	dh $@