diff -pruN 0.3.10+nods-4.1/debian/changelog 0.3.10+nods-4.1ubuntu1/debian/changelog
--- 0.3.10+nods-4.1/debian/changelog	2021-02-06 16:02:21.000000000 +0000
+++ 0.3.10+nods-4.1ubuntu1/debian/changelog	2021-11-19 01:50:37.000000000 +0000
@@ -1,3 +1,16 @@
+nextepc (0.3.10+nods-4.1ubuntu1) jammy; urgency=medium
+
+  * debian/patches/gcc-11.patch: fix build failure with gcc-11.  Closes:
+    #984256.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 19 Nov 2021 01:50:37 +0000
+
+nextepc (0.3.10+nods-4.1build1) jammy; urgency=medium
+
+  * No-change rebuild against libidn12
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 07 Nov 2021 05:33:37 +0000
+
 nextepc (0.3.10+nods-4.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -pruN 0.3.10+nods-4.1/debian/control 0.3.10+nods-4.1ubuntu1/debian/control
--- 0.3.10+nods-4.1/debian/control	2021-01-23 22:35:09.000000000 +0000
+++ 0.3.10+nods-4.1ubuntu1/debian/control	2021-11-07 05:33:37.000000000 +0000
@@ -1,5 +1,6 @@
 Source: nextepc
-Maintainer: Debian Mobcom Maintainers <Debian-mobcom-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Mobcom Maintainers <Debian-mobcom-maintainers@lists.alioth.debian.org>
 Uploaders: Ruben Undheim <ruben.undheim@gmail.com>
 Section: net
 Priority: optional
diff -pruN 0.3.10+nods-4.1/debian/patches/gcc-11.patch 0.3.10+nods-4.1ubuntu1/debian/patches/gcc-11.patch
--- 0.3.10+nods-4.1/debian/patches/gcc-11.patch	1970-01-01 00:00:00.000000000 +0000
+++ 0.3.10+nods-4.1ubuntu1/debian/patches/gcc-11.patch	2021-11-19 01:50:37.000000000 +0000
@@ -0,0 +1,27 @@
+Description: fix build failure with gcc-11.
+Author: Steve Langasek <steve.langasek@ubuntu.com>
+Bug-Debian: https://bugs.debian.org/984256
+Last-Update: 2021-11-18
+
+Index: nextepc-0.3.10+nods/lib/core/test/testatomic.c
+===================================================================
+--- nextepc-0.3.10+nods.orig/lib/core/test/testatomic.c
++++ nextepc-0.3.10+nods/lib/core/test/testatomic.c
+@@ -100,7 +100,7 @@
+ 
+ static void test_casptr_equal_nonnull(abts_case *tc, void *data)
+ {
+-    int a, b;
++    int a = 0, b = 0;
+     void *target_ptr = &a;
+     void *old_ptr;
+ 
+@@ -111,7 +111,7 @@
+ 
+ static void test_casptr_notequal(abts_case *tc, void *data)
+ {
+-    int a, b;
++    int a = 0, b = 0;
+     void *target_ptr = &a;
+     void *old_ptr;
+ 
diff -pruN 0.3.10+nods-4.1/debian/patches/series 0.3.10+nods-4.1ubuntu1/debian/patches/series
--- 0.3.10+nods-4.1/debian/patches/series	2021-01-23 22:35:09.000000000 +0000
+++ 0.3.10+nods-4.1ubuntu1/debian/patches/series	2021-11-19 01:49:29.000000000 +0000
@@ -5,3 +5,4 @@
 0005-Set-install-dir-for-freediameter-libs.patch
 0006-Fix-big-endian-bug.patch
 0007-Patch-deprecated-sys-sysctl.h-problem.patch
+gcc-11.patch