diff --git a/ChangeLog b/ChangeLog
index 1fb03831d..cf7ddc30c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2025-12-07  Alejandro Colomar <alx@kernel.org>
+
+	* bootstrap.conf (gnulib_modules): Add stdcountof-h.
+
+	Continues the long process of fixing Savannah #66518.
+
 2025-12-19  G. Branden Robinson <g.branden.robinson@gmail.com>
 
 	[troff]: Trivially refactor.  Rename `get_long_name()` to
diff --git a/bootstrap.conf b/bootstrap.conf
index f16f9e7e0..0ac3fa415 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -37,6 +37,7 @@ checkout_only_file=FOR-RELEASE
 # can be get through gettext though
 gnulib_modules="
     attribute
+    stdcountof-h
     getopt-gnu
     git-version-gen
     havelib