diff -pruN 2.5.4-4/debian/changelog 2.5.4-5/debian/changelog
--- 2.5.4-4/debian/changelog	2025-03-04 23:03:06.000000000 +0000
+++ 2.5.4-5/debian/changelog	2025-08-30 09:36:25.000000000 +0000
@@ -1,3 +1,15 @@
+libtool (2.5.4-5) unstable; urgency=medium
+
+  [ Alastair McKinstry ]
+  * Clean more autogenerated files for repeated builds. Closes: #1048097
+  * Drop Suggests: gck-jdk. Closes: #982873
+
+  [ Helmut Grohe ]
+  * Fix FTCBFS: Use gfortran-for-host. (Closes: #1086592)
+    As a result gfortran must be triplet-prefixed even in native builds.
+
+ -- Alastair McKinstry <mckinstry@debian.org>  Sat, 30 Aug 2025 10:36:25 +0100
+
 libtool (2.5.4-4) unstable; urgency=medium
 
   [ Jordi Mallach ]
diff -pruN 2.5.4-4/debian/control 2.5.4-5/debian/control
--- 2.5.4-4/debian/control	2025-03-04 23:03:06.000000000 +0000
+++ 2.5.4-5/debian/control	2025-08-30 09:36:25.000000000 +0000
@@ -1,7 +1,7 @@
 Source: libtool
 Build-Depends: debhelper-compat (= 13),
   file,
-  gfortran | fortran95-compiler,
+  gfortran-for-host | fortran95-compiler,
   automake (>= 1:1.14.1-3),
   autoconf (>= 2.69-7),
   help2man,
@@ -25,7 +25,7 @@ Depends: gcc | c-compiler, cpp, libc6-de
   file,
   autotools-dev,
   ${misc:Depends}
-Suggests: libtool-doc, autoconf, automaken, gfortran | fortran95-compiler, gcj-jdk
+Suggests: libtool-doc, autoconf, automaken, gfortran | fortran95-compiler
 Recommends: libltdl-dev
 Description: Generic library support script
  This is GNU libtool, a generic library support script.  Libtool hides
diff -pruN 2.5.4-4/debian/rules 2.5.4-5/debian/rules
--- 2.5.4-4/debian/rules	2025-03-04 23:03:06.000000000 +0000
+++ 2.5.4-5/debian/rules	2025-08-30 09:36:25.000000000 +0000
@@ -15,6 +15,12 @@ DPKG_EXPORT_BUILDFLAGS := 1
 include /usr/share/dpkg/buildflags.mk
 include /usr/share/dpkg/pkg-info.mk
 
+# Always use triplet-prefixed tools with gfortran-for-host.
+ifeq ($(origin FC),default)
+export FC := $(DEB_HOST_GNU_TYPE)-gfortran
+endif
+export F77 ?= $(FC)
+
 # libltdl needs to conform to policy
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
@@ -60,6 +66,10 @@ clean:
 	rm -f build-aux/do-release-commit-and-tag build-aux/gnu-web-doc-update 
 	rm -f m4/gnulib-common.m4 m4/00gnulib.m4 maint.mk doc/fdl.texi
 	rm -f doc/gendocs_template GNUmakefile
+	rm -f doc/stamp-vti libltdl/aclocal.m4 tests/testsuite
+	rm -f aclocal.m4 doc/gendocs_template_min doc/version.texi gnulib-tests/Makefile.am gnulib-tests/Makefile.in gnulib-tests/init.sh
+	rm -f gnulib-tests/test-init.sh m4/zzgnulib.m4 gnulib-tests/test-vc-list-files-git.sh gnulib-tests/test-vc-list-files-cvs.sh
+	rm -f gnulib-tests/test-update-copyright.sh
 	# Undo the version change if there is any.
 	sed -i -e "s/\$$scriptversion.*/\$$scriptversion/" libtoolize.in
 	sed -i -e "s/\$$scriptversion.*/\$$scriptversion/" build-aux/ltmain.in
