diff --git a/main/gettext/APKBUILD b/main/gettext/APKBUILD
index fc826082dbf..0eb3c84a353 100644
--- a/main/gettext/APKBUILD
+++ b/main/gettext/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=gettext
 pkgver=0.24.1
-pkgrel=0
+pkgrel=1
 pkgdesc="GNU locale utilities"
 url="https://www.gnu.org/software/gettext/gettext.html"
 arch="all"
@@ -12,7 +12,9 @@ license="GPL-3.0-or-later AND LGPL-2.1-or-later AND MIT"
 # they depend on gettext and would introduce cyclic dependencies
 # xz for autopoint autoreconf
 depends_dev="!musl-libintl xz"
-makedepends="perl ncurses-dev libxml2-dev~2.13 libunistring-dev"
+# FIXME: drop $_autoreconfdepends after d0e2097_fix-am-nls-autoreconf.patch is included in the tarball
+_autoreconfdepends="autoconf automake libtool"
+makedepends="perl ncurses-dev libxml2-dev~2.13 libunistring-dev $_autoreconfdepends"
 checkdepends="coreutils"
 subpackages="
 	$pkgname-dbg
@@ -27,6 +29,7 @@ subpackages="
 	"
 source="https://ftp.gnu.org/gnu/gettext/gettext-$pkgver.tar.xz
 	cwd.patch
+	d0e2097_fix-am-nls-autoreconf.patch
 	skip-tests-musl.patch
 	skip-meaningless-pthread-rwlock-test.patch
 	"
@@ -35,6 +38,14 @@ source="https://ftp.gnu.org/gnu/gettext/gettext-$pkgver.tar.xz
 #   0.20.1-r0:
 #     - CVE-2018-18751
 
+prepare() {
+	default_prepare
+
+	# reconfigure for automake-1.18
+	# https://gitweb.git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=f744352a02ea1a6dd97615901d21ef5244984b40
+	autoreconf -fi
+}
+
 build() {
 	# force using system posix complaint printf
 	# the test is broken and fails with ash
@@ -94,6 +105,7 @@ _envsubst() {
 sha512sums="
 53d5c54105598cc6156b940ff82d9754f4b7cdeafcd2400206c975db9412012511b60a7ebefcd31068a0bc2d99173ecd93a66844c7f3a9772df69d53b3cebeb5  gettext-0.24.1.tar.xz
 31796534e40c1569b08cf48e25375ca1d0f439df8aa0d24283769d52a290e28522760128f11f5bd04217605974ae1fdee9557ec189ed32b11b2a45b4af3b0f4a  cwd.patch
+d048549a3e9aec8e507b94d055ef39059bb9c5df86ee7857135c08bc024a30bf5b044312d7e69700d30b0ccf5c806ef3523c7cd0316acfe0affbee876f56a872  d0e2097_fix-am-nls-autoreconf.patch
 a16963f804ce4abe8480da211228f7b24a0715d6ef3ff7d5e5c58a1387d6c4260ee237864081b05b164f082ef199a592494ce691dd0c96c61978e4c451707c7a  skip-tests-musl.patch
 e426f3a3bc39193e0dbf8d51e0019e672ddcab07b277281a1912fd0ec6a3fea5eb59bc4daeed465e152c567b05d6c3b457e4bc415a8d36dd768725fb72daf817  skip-meaningless-pthread-rwlock-test.patch
 "
diff --git a/main/gettext/d0e2097_fix-am-nls-autoreconf.patch b/main/gettext/d0e2097_fix-am-nls-autoreconf.patch
new file mode 100644
index 00000000000..d0e23b9df23
--- /dev/null
+++ b/main/gettext/d0e2097_fix-am-nls-autoreconf.patch
@@ -0,0 +1,54 @@
+commit d0e209799a32903516017b84b5db18c5a6605779
+Author: Bruno Haible <bruno@clisp.org>
+Date:   Tue Jul 1 14:27:37 2025 +0200
+
+    Fix an autoreconf failure in packages that only need AM_NLS.
+    
+    Rationale: https://lists.gnu.org/archive/html/bug-gettext/2025-06/msg00009.html
+    
+    * gettext-tools/m4/Makefile.am (aclocaldir, aclocal_DATA): New variables.
+    * PACKAGING: Update.
+
+diff --git a/PACKAGING b/PACKAGING
+index 73fb94d..a520407 100644
+--- a/PACKAGING
++++ b/PACKAGING
+@@ -187,6 +187,7 @@ the following file list.
+       $prefix/share/gettext/archive.cvs.tar.*   (only installed if --with-cvs specified)
+       $prefix/share/gettext/disclaim-translations.txt
+       $prefix/share/gettext-$VERSION/its/*
++      $prefix/share/aclocal/nls.m4
+       $prefix/share/emacs/site-lisp/po-compat.el
+       $prefix/share/emacs/site-lisp/po-compat.elc
+       $prefix/share/emacs/site-lisp/po-mode.el
+diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am
+index ba74da9..158c002 100644
+--- a/gettext-tools/m4/Makefile.am
++++ b/gettext-tools/m4/Makefile.am
+@@ -57,7 +57,17 @@ EXTRA_DIST = \
+   locale-de.m4
+ 
+ 
+-# List of all file names that we ever stored in $(aclocaldir).
++# Files installed for use by the old intltool.m4.
++# Listing nls.m4 is OK here, since it has essentially not changed over 20 years
++# and probably won't change in the future either.
++
++aclocaldir = @aclocaldir@
++aclocal_DATA = \
++  ../../gettext-runtime/m4/nls.m4
++
++
++# List of all file names that we ever stored in $(aclocaldir),
++# minus those that we still store in $(aclocaldir).
+ OLD_M4_FILES = \
+   build-to-host.m4 \
+   codeset.m4 \
+@@ -85,7 +95,6 @@ OLD_M4_FILES = \
+   lock.m4 \
+   longdouble.m4 \
+   longlong.m4 \
+-  nls.m4 \
+   po.m4 \
+   printf-posix.m4 \
+   progtest.m4 \