diff -Nru binfmt-support-2.2.2/debian/changelog binfmt-support-2.2.2/debian/changelog
--- binfmt-support-2.2.2/debian/changelog	2024-02-27 16:55:15.000000000 +0000
+++ binfmt-support-2.2.2/debian/changelog	2024-03-29 19:40:49.000000000 +0000
@@ -1,3 +1,9 @@
+binfmt-support (2.2.2-7) unstable; urgency=medium
+
+  * Build-depend on gnulib and rebootstrap from it at build time.
+
+ -- Colin Watson <cjwatson@debian.org>  Fri, 29 Mar 2024 19:40:49 +0000
+
 binfmt-support (2.2.2-6) unstable; urgency=medium
 
   * Build-depend on pkgconf rather than pkg-config.
diff -Nru binfmt-support-2.2.2/debian/control binfmt-support-2.2.2/debian/control
--- binfmt-support-2.2.2/debian/control	2024-02-27 16:55:15.000000000 +0000
+++ binfmt-support-2.2.2/debian/control	2024-03-29 19:40:49.000000000 +0000
@@ -4,6 +4,7 @@
 Maintainer: Colin Watson <cjwatson@debian.org>
 Standards-Version: 4.0.0
 Build-Depends: debhelper-compat (= 13),
+               gnulib,
                libpipeline-dev,
                pkgconf,
                systemd-dev,
diff -Nru binfmt-support-2.2.2/debian/rules binfmt-support-2.2.2/debian/rules
--- binfmt-support-2.2.2/debian/rules	2024-02-27 16:55:15.000000000 +0000
+++ binfmt-support-2.2.2/debian/rules	2024-03-29 19:40:49.000000000 +0000
@@ -5,6 +5,10 @@
 %:
 	dh $@ --builddirectory=debian/build
 
+override_dh_autoreconf:
+	dh_autoreconf ./bootstrap -- \
+		--gnulib-srcdir=/usr/share/gnulib --no-git --skip-po
+
 # --libexecdir is set here because debhelper defaults to using multiarch
 # paths at compat level 9, which is a reasonable choice in general but
 # unnecessary here.