diff -pruN 1.16.1-3/debian/.gitignore 1.16.1-3ubuntu1/debian/.gitignore
--- 1.16.1-3/debian/.gitignore	2025-09-30 16:11:16.000000000 +0000
+++ 1.16.1-3ubuntu1/debian/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-/*.debhelper
-/*.substvars
-/flatpak-tests/
-/flatpak/
-/gir1.2-flatpak-1.0/
-/libflatpak-dev/
-/libflatpak-doc/
-/libflatpak0/
diff -pruN 1.16.1-3/debian/changelog 1.16.1-3ubuntu1/debian/changelog
--- 1.16.1-3/debian/changelog	2025-09-30 16:11:16.000000000 +0000
+++ 1.16.1-3ubuntu1/debian/changelog	2025-10-27 15:12:57.000000000 +0000
@@ -1,3 +1,11 @@
+flatpak (1.16.1-3ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable (LP: #2129958). Remaining changes:
+    - Fix ppc64el autopkgtests (LP #2121039)
+      Enriched the DEP-3 headers to point to upstream repo
+
+ -- Simon Chopin <schopin@ubuntu.com>  Mon, 27 Oct 2025 16:12:57 +0100
+
 flatpak (1.16.1-3) unstable; urgency=medium
 
   * Fix <!nocheck> builds (Closes: #1116737)
@@ -16,6 +24,12 @@ flatpak (1.16.1-3) unstable; urgency=med
 
  -- Simon McVittie <smcv@debian.org>  Tue, 30 Sep 2025 17:11:16 +0100
 
+flatpak (1.16.1-2ubuntu1) questing; urgency=medium
+
+  * Fix ppc64el autopkgtests (LP: #2121039)
+
+ -- Simon Chopin <schopin@ubuntu.com>  Wed, 27 Aug 2025 18:36:38 +0200
+
 flatpak (1.16.1-2) unstable; urgency=medium
 
   * d/copyright: Point to GNU web address instead of old FSF postal address
diff -pruN 1.16.1-3/debian/control 1.16.1-3ubuntu1/debian/control
--- 1.16.1-3/debian/control	2025-09-30 16:11:16.000000000 +0000
+++ 1.16.1-3ubuntu1/debian/control	2025-10-27 15:12:57.000000000 +0000
@@ -1,7 +1,8 @@
 Source: flatpak
 Section: admin
 Priority: optional
-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
 Uploaders:
  Matthias Klumpp <mak@debian.org>,
  Simon McVittie <smcv@debian.org>,
diff -pruN 1.16.1-3/debian/patches/0001-testlib-add-expected-argument-to-fcntl-F_DUPFD.patch 1.16.1-3ubuntu1/debian/patches/0001-testlib-add-expected-argument-to-fcntl-F_DUPFD.patch
--- 1.16.1-3/debian/patches/0001-testlib-add-expected-argument-to-fcntl-F_DUPFD.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1.16.1-3ubuntu1/debian/patches/0001-testlib-add-expected-argument-to-fcntl-F_DUPFD.patch	2025-10-27 15:12:57.000000000 +0000
@@ -0,0 +1,45 @@
+From 27fb3adf4026a79156c2b62b8ba3b86af41da8d0 Mon Sep 17 00:00:00 2001
+From: Simon Chopin <simon.chopin@canonical.com>
+Date: Wed, 27 Aug 2025 17:56:12 +0200
+Subject: [PATCH] testlib: add expected argument to fcntl(F_DUPFD)
+
+The F_DUPFD and its relative F_DUPFD_CLOEXEC both expect an int argument
+as extra argument, being the minimal value for the new FD. This argument
+must be within the accepted range (see ulimit -H -n).
+
+This was detected in Ubuntu during testing against the latest glibc,
+stracing resulted in:
+
+107244 fcntl(1, F_DUPFD_CLOEXEC, 1847846346272) = -1 EINVAL (Invalid argument)
+
+On the system in question (ppc64el machine running Ubuntu Questing), the
+relevant limit is 524288.
+
+For the fix we use 3 as a reasonable floor value, as in the first one
+after stderr. It also happens to be the one used in revokefs/main.c.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/2121039
+Forwarded: https://github.com/flatpak/flatpak/pull/6291
+Applied-Upstream: Expected for 1.16.2
+---
+ tests/testlib.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/testlib.c b/tests/testlib.c
+index 41f27ac9..90c0f0b4 100644
+--- a/tests/testlib.c
++++ b/tests/testlib.c
+@@ -257,7 +257,7 @@ tests_stdout_to_stderr_begin (void)
+ {
+   TestsStdoutToStderr *original = g_new0 (TestsStdoutToStderr, 1);
+ 
+-  original->fd = fcntl (STDOUT_FILENO, F_DUPFD_CLOEXEC);
++  original->fd = fcntl (STDOUT_FILENO, F_DUPFD_CLOEXEC, 3);
+ 
+   if (original->fd < 0)
+     g_error ("fcntl F_DUPFD_CLOEXEC: %s", g_strerror (errno));
+
+base-commit: d10e11482d42996c47bc0d4f97b513fc197a7e2b
+-- 
+2.48.1
+
diff -pruN 1.16.1-3/debian/patches/series 1.16.1-3ubuntu1/debian/patches/series
--- 1.16.1-3/debian/patches/series	2025-09-30 16:11:16.000000000 +0000
+++ 1.16.1-3ubuntu1/debian/patches/series	2025-10-27 15:12:57.000000000 +0000
@@ -1 +1,2 @@
 debian/system-helper-Set-Debian-s-canonical-home-directory-for-s.patch
+0001-testlib-add-expected-argument-to-fcntl-F_DUPFD.patch