diff -pruN 4.00c-1/debian/changelog 4.00c-1ubuntu1/debian/changelog
--- 4.00c-1/debian/changelog	2022-02-07 13:54:56.000000000 +0000
+++ 4.00c-1ubuntu1/debian/changelog	2022-02-23 16:23:37.000000000 +0000
@@ -1,3 +1,11 @@
+aflplusplus (4.00c-1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Increase test-custom-mutators timeouts to avoid
+      FTBFS on arm64 amd armhf
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 23 Feb 2022 17:23:37 +0100
+
 aflplusplus (4.00c-1) unstable; urgency=medium
 
   * Switch to llvm-toolchain-13 (Closes: #1004881)
@@ -10,6 +18,19 @@ aflplusplus (4.00c-1) unstable; urgency=
 
  -- Sophie Brun <sophie@offensive-security.com>  Mon, 07 Feb 2022 14:54:56 +0100
 
+aflplusplus (3.14c-2ubuntu1) jammy; urgency=medium
+
+  * Increase test-custom-mutators timeouts to avoid
+    FTBFS on arm64 amd armhf
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Wed, 02 Feb 2022 15:53:26 +0000
+
+aflplusplus (3.14c-2build1) jammy; urgency=medium
+
+  * No-change rebuild with Python 3.10 as default version
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Fri, 14 Jan 2022 11:24:00 +0000
+
 aflplusplus (3.14c-2) unstable; urgency=medium
 
   * Add correctly the helper-scripts afl-clang and afl-clang++ (issue with
diff -pruN 4.00c-1/debian/control 4.00c-1ubuntu1/debian/control
--- 4.00c-1/debian/control	2022-02-07 13:54:56.000000000 +0000
+++ 4.00c-1ubuntu1/debian/control	2022-02-07 21:14:20.000000000 +0000
@@ -1,7 +1,8 @@
 Source: aflplusplus
 Section: devel
 Priority: optional
-Maintainer: Debian Security Tools <team+pkg-security@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Security Tools <team+pkg-security@tracker.debian.org>
 Uploaders:
  Sophie Brun <sophie@offensive-security.com>,
  Raphaël Hertzog <raphael@offensive-security.com>
diff -pruN 4.00c-1/debian/patches/increase-custom-mutators-test-timeout.patch 4.00c-1ubuntu1/debian/patches/increase-custom-mutators-test-timeout.patch
--- 4.00c-1/debian/patches/increase-custom-mutators-test-timeout.patch	1970-01-01 00:00:00.000000000 +0000
+++ 4.00c-1ubuntu1/debian/patches/increase-custom-mutators-test-timeout.patch	2022-02-02 15:02:16.000000000 +0000
@@ -0,0 +1,24 @@
+Description: Increase test-custom-mutators timeouts
+Author: Graham Inggs <ginggs@debian.org>
+Last-Update: 2022-02-02
+
+--- a/test/test-custom-mutators.sh
++++ b/test/test-custom-mutators.sh
+@@ -59,7 +59,7 @@
+       # Run afl-fuzz w/ multiple C mutators
+       $ECHO "$GREY[*] running afl-fuzz with multiple custom C mutators, this will take approx 10 seconds"
+       {
+-        AFL_CUSTOM_MUTATOR_LIBRARY="./libexamplemutator.so;./libexamplemutator2.so" AFL_CUSTOM_MUTATOR_ONLY=1 ../afl-fuzz -V10 -m ${MEM_LIMIT} -i in -o out -- ./test-multiple-mutators >>errors 2>&1
++        AFL_CUSTOM_MUTATOR_LIBRARY="./libexamplemutator.so;./libexamplemutator2.so" AFL_CUSTOM_MUTATOR_ONLY=1 ../afl-fuzz -t15000 -V10 -m ${MEM_LIMIT} -i in -o out -- ./test-multiple-mutators >>errors 2>&1
+       } >>errors 2>&1
+ 
+       test -n "$( ls out/default/crashes/id:000000* 2>/dev/null )" && {  # TODO: update here
+@@ -80,7 +80,7 @@
+       {
+         export PYTHONPATH=${CUSTOM_MUTATOR_PATH}
+         export AFL_PYTHON_MODULE=example
+-        AFL_CUSTOM_MUTATOR_ONLY=1 ../afl-fuzz -V10 -m ${MEM_LIMIT} -i in -o out -- ./test-custom-mutator >>errors 2>&1
++        AFL_CUSTOM_MUTATOR_ONLY=1 ../afl-fuzz -t15000 -V10 -m ${MEM_LIMIT} -i in -o out -- ./test-custom-mutator >>errors 2>&1
+         unset PYTHONPATH
+         unset AFL_PYTHON_MODULE
+       } >>errors 2>&1
diff -pruN 4.00c-1/debian/patches/series 4.00c-1ubuntu1/debian/patches/series
--- 4.00c-1/debian/patches/series	2022-02-07 13:54:56.000000000 +0000
+++ 4.00c-1ubuntu1/debian/patches/series	2022-02-23 16:23:30.000000000 +0000
@@ -1,2 +1,3 @@
+increase-custom-mutators-test-timeout.patch
 change-cflags-for-test.patch
 Fix-spelling-errors.patch