diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources
index fe89c9b..a9a4bc2 100644
--- a/SHA256SUMS.sources
+++ b/SHA256SUMS.sources
@@ -31,6 +31,7 @@ a32032bab36208509466654df12f507600dfe0313feebbcd218c32a70bf72a16  grep-2.4.tar.g
 9f233d8b78e4351fe9dd2d50d83958a0e5af36f54e9818521458a08e058691ba  heirloom-devtools-070527.tar.bz2
 a4adadf76b496a6bc50795702253ecfcb6f0d159b68038f31a5362009340bca2  help2man-1.36.4.tar.gz
 8e8ce6175d435e7df8c9bbb0e5fd5357691cdc28c1a2d00fdd9b47b7643bec3a  libtool-1.4.tar.gz
+c4e63399b12f5858d11c44cea8e92f21cd564f8548e488dadc84046b424c80fc  libtool-2.2.4.tar.bz2
 093c993767f563a11e41c1cf887f4e9065247129679d4c1e213d0544d16d8303  m4-1.4.7.tar.gz
 64b30b41fde2ebf669e6af489883fb1df6a06ac30555a96cfa3c39ecce7267dd  make-3.80.tar.gz
 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3  musl-1.1.24.tar.gz
diff --git a/parts.rst b/parts.rst
index 369a802..ee510c0 100644
--- a/parts.rst
+++ b/parts.rst
@@ -423,11 +423,6 @@ In particular we can now use full featured ``ar`` instead of ``tcc -ar``,
 the GNU linker ``ld``, which allows us building shared libraries,
 and the GNU assembler ``as``.
 
-libtool 1.4
-===========
-
-Rebuild libtool, so that it uses GNU binutils when creating shared libraries.
-
 musl 1.1.24 (v3)
 ================
 
@@ -515,6 +510,11 @@ findutils 4.2.33
 GNU Find Utilities can be used to search for files. We are mainly interested
 in ``find`` and ``xargs`` that are often used in scripts.
 
+libtool 2.2.4
+=============
+
+Newer version of libtool which is more compatible with modern Autotools.
+
 gcc 4.0.4
 =========
 
diff --git a/rootfs.sh b/rootfs.sh
index ed98b3d..647a35d 100755
--- a/rootfs.sh
+++ b/rootfs.sh
@@ -270,6 +270,9 @@ get_file https://ftp.gnu.org/gnu/bash/bash-5.1.tar.gz
 # findutils 4.2.33
 get_file https://ftp.gnu.org/gnu/findutils/findutils-4.2.33.tar.gz
 
+# libtool 2.2.4
+get_file https://ftp.gnu.org/gnu/libtool/libtool-2.2.4.tar.bz2
+
 # General cleanup
 find tmp -name .git -exec rm -rf \;
 
diff --git a/sysa/bash-5.1/checksums b/sysa/bash-5.1/checksums
index 89e966c..5b2109c 100644
--- a/sysa/bash-5.1/checksums
+++ b/sysa/bash-5.1/checksums
@@ -1 +1 @@
-bf782a82ac8ce393d2a028cec337a4f9428f8ab93d2ae11b026dcc8a027b80a7  /after/bin/bash
+42d8035dd5e893be2dabcaee3064e13b9d993efae5383bedececa9a7ef172ff0  /after/bin/bash
diff --git a/sysa/gcc-4.0.4/checksums/pass1 b/sysa/gcc-4.0.4/checksums/pass1
index 54f8ade..7c6b1e1 100644
--- a/sysa/gcc-4.0.4/checksums/pass1
+++ b/sysa/gcc-4.0.4/checksums/pass1
@@ -5,10 +5,10 @@
 903b1dae32b217048b1a35a934836496027e6947b77f5711cb8714cd5241dda0  /after/libexec/gcc/i386-unknown-linux-gnu/4.0.4/cc1
 711689a618e34a0cff2c6061e554f9a2f9d447a7623bd46ba11c2eb816932883  /after/libexec/gcc/i386-unknown-linux-gnu/4.0.4/collect2
 a3fbed284b1efaf6fccfc81eddd9bad8c4cf07673b16e8885ad6f31a1569c9b4  /after/libexec/gcc/i386-unknown-linux-gnu/4.0.4/install-tools/fixincl
-de4566c661258fa626ea7076e6c57af95c01d0786bcdadb12af23852cc421a2a  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbegin.o
-c7eea5e845fe2ee5538704d59c6e777d4f72b7100e78d5f86f8d95d96ab2ec20  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbeginS.o
-de4566c661258fa626ea7076e6c57af95c01d0786bcdadb12af23852cc421a2a  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbeginT.o
+f2c7e7bf5377e10927c5d243eaa9eb3ae9bed7aab393621831673b368ebae00f  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbegin.o
+c76e19409c9344a10213e0abb18481aae6416342db4971fb99a116a91fb164da  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbeginS.o
+f2c7e7bf5377e10927c5d243eaa9eb3ae9bed7aab393621831673b368ebae00f  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbeginT.o
 342276a6ad25e3d064bba9c5d50fbeaae15d0aefdc5c72b1e796366189af1b1b  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtend.o
 2bf001e0be96ea7c53adf35b1bf0a677eee02008e3aee6c30166d100b720687c  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtendS.o
-7b416e87b8e5998c042b64b4b87499720895c17deeffc0bc1b79f6fac502d51b  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/libgcc.a
-efc9783c7386519ef7d5bfe7fadf16d4b6b717deb18dd04e09d810354f015942  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/libgcov.a
+e3c2b3754058829d79b42a4968f3a3dda6e289b51b4b3580f4ccbc64ff473a26  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/libgcc.a
+fc093c2bcf6473237c1187fc93b60e5d353bf710958d7151283c96074af0a899  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/libgcov.a
diff --git a/sysa/gcc-4.0.4/checksums/pass2 b/sysa/gcc-4.0.4/checksums/pass2
index 437b4bb..8495d4a 100644
--- a/sysa/gcc-4.0.4/checksums/pass2
+++ b/sysa/gcc-4.0.4/checksums/pass2
@@ -1,14 +1,14 @@
-22234bd8a949cfab257e10e97a3e990ebb79a75afc5f50e875586bb9367910a7  /after/bin/cpp
-a47e2b29f19aa69b4a40757accd73307f6b51bc9ebcc101aa628906d7c2d3b67  /after/bin/gcc
-a47e2b29f19aa69b4a40757accd73307f6b51bc9ebcc101aa628906d7c2d3b67  /after/bin/i386-unknown-linux-gnu-gcc
-a47e2b29f19aa69b4a40757accd73307f6b51bc9ebcc101aa628906d7c2d3b67  /after/bin/i386-unknown-linux-gnu-gcc-4.0.4
-9d4c0a3b340c1c22b81dd450ef894b02323e059c56cd3ceff423ee316f0ac0a2  /after/libexec/gcc/i386-unknown-linux-gnu/4.0.4/cc1
-ada38c050d3b2e6e96da2db86dbabebbd2c4cc4bdc2ba258358af9c64e882bed  /after/libexec/gcc/i386-unknown-linux-gnu/4.0.4/collect2
-7c335c92800b34be9a3add28d529657812f62ec066b4c2a2dcba28c65f6d4e34  /after/libexec/gcc/i386-unknown-linux-gnu/4.0.4/install-tools/fixincl
-a07db1648128987f10debb1730b4456c0423aab5bd93d68e4f2b47447a11c5d9  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbegin.o
-20a3bbbd5cd59b91660628d416d489437463b651fa15b5ea5f026b45c9e35b65  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbeginS.o
-a07db1648128987f10debb1730b4456c0423aab5bd93d68e4f2b47447a11c5d9  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbeginT.o
+88dbe31603504b89ced21ceb5d7205f20c9473a6df814bb80f2b28ddebc977c5  /after/bin/cpp
+2b909307bd6b0bf7fed4363122948561da6518acfd74b809c3ab7ede2da8fcfb  /after/bin/gcc
+2b909307bd6b0bf7fed4363122948561da6518acfd74b809c3ab7ede2da8fcfb  /after/bin/i386-unknown-linux-gnu-gcc
+2b909307bd6b0bf7fed4363122948561da6518acfd74b809c3ab7ede2da8fcfb  /after/bin/i386-unknown-linux-gnu-gcc-4.0.4
+7fda283cdddc9ecb96aa64eee6ba70a95b5547e47537934ec3a98a7f9846b563  /after/libexec/gcc/i386-unknown-linux-gnu/4.0.4/cc1
+289a9da62408356b8d21472497fd26b9021e27b9bc7834b969d11791eba4fd58  /after/libexec/gcc/i386-unknown-linux-gnu/4.0.4/collect2
+8c8c0c1781c361a5e585811c3712ae8d052c6d2bb1d18328c50329b74e712144  /after/libexec/gcc/i386-unknown-linux-gnu/4.0.4/install-tools/fixincl
+282f0f0d79a9f1559f700db14f8a360194e1e8ab522ecad91aa29d10ea1bfb1a  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbegin.o
+693e3dc5d35724960692e3e81280bad9e21de68f3884e52b86e874d20baf8151  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbeginS.o
+282f0f0d79a9f1559f700db14f8a360194e1e8ab522ecad91aa29d10ea1bfb1a  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbeginT.o
 342276a6ad25e3d064bba9c5d50fbeaae15d0aefdc5c72b1e796366189af1b1b  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtend.o
 2bf001e0be96ea7c53adf35b1bf0a677eee02008e3aee6c30166d100b720687c  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtendS.o
-5d3c8a9b80e4e34dfb70a56d6e23a05e01d2ecdbf60232a1b053462d4a98e99e  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/libgcc.a
-f8c3b07e0f98b7f34ac0960d98f3b59ee0f47c42e72c529d10d66dccdc9b5d46  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/libgcov.a
+e1789e68464c8c04e77180f8a5dc5855aa6b488a8b11526c77f70d89453122e4  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/libgcc.a
+3332fba4918963e196c701e00cc68ea28c5b00b4da0bd01ace911f0441c4932c  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/libgcov.a
diff --git a/sysa/gcc-4.0.4/pass1.sh b/sysa/gcc-4.0.4/pass1.sh
index b18b04e..c2bcbfd 100755
--- a/sysa/gcc-4.0.4/pass1.sh
+++ b/sysa/gcc-4.0.4/pass1.sh
@@ -42,6 +42,7 @@ src_prepare() {
     # Rebuild libtool files
     rm config.guess config.sub ltmain.sh
     libtoolize
+    cp "${PREFIX}/"/share/automake-1.9/config.sub .
 
     # Rebuild bison files
     # Workaround for bison being too new
@@ -77,6 +78,8 @@ src_configure() {
 src_compile() {
     mkdir -p /usr/
     ln -sf "${PREFIX}"/include /usr/include
+    ln -sf /usr/include/limits.h /usr/include/sys/limits.h
+
     make -C build LIBGCC2_INCLUDES=-I"${PREFIX}/include/musl"
 }
 
diff --git a/sysa/gcc-4.0.4/pass2.sh b/sysa/gcc-4.0.4/pass2.sh
index 6924919..6a8ade5 100755
--- a/sysa/gcc-4.0.4/pass2.sh
+++ b/sysa/gcc-4.0.4/pass2.sh
@@ -41,6 +41,7 @@ src_prepare() {
     # Rebuild libtool files
     rm config.guess config.sub ltmain.sh
     libtoolize
+    cp "${PREFIX}/"/share/automake-1.9/config.sub .
 
     # Rebuild bison files
     # Workaround for bison being too new
diff --git a/sysa/libtool-1.4/checksums/pass1 b/sysa/libtool-1.4/checksums
similarity index 100%
rename from sysa/libtool-1.4/checksums/pass1
rename to sysa/libtool-1.4/checksums
diff --git a/sysa/libtool-1.4/checksums/pass2 b/sysa/libtool-1.4/checksums/pass2
deleted file mode 100644
index 92ab87c..0000000
--- a/sysa/libtool-1.4/checksums/pass2
+++ /dev/null
@@ -1,2 +0,0 @@
-23a6e91bff3d5bac9b0317b60bd1c999f94846f62085bf4d227dfa8499120d22  /after/lib/musl/libltdl.a
-c247c7c1516ed35414c8b038535969a67ce4bbfd2abdfed85a89941bca09d55d  /after/lib/musl/libltdl.la
diff --git a/sysa/libtool-1.4/pass1.sh b/sysa/libtool-1.4/libtool-1.4.sh
similarity index 65%
rename from sysa/libtool-1.4/pass1.sh
rename to sysa/libtool-1.4/libtool-1.4.sh
index eeec759..fbc1f95 100755
--- a/sysa/libtool-1.4/pass1.sh
+++ b/sysa/libtool-1.4/libtool-1.4.sh
@@ -10,12 +10,12 @@ src_prepare() {
 
 src_configure() {
     CC=tcc LD=true AR="tcc -ar" ./configure \
-      --prefix="${PREFIX}" \
-      --libdir="${PREFIX}/lib/musl" \
-      --disable-shared \
-      --host=i386-unknown-linux \
-      --target=i386-unknown-linux \
-      --build=i386-unknown-linux
+        --prefix="${PREFIX}" \
+        --libdir="${PREFIX}/lib/musl" \
+        --disable-shared \
+        --host=i386-unknown-linux \
+        --target=i386-unknown-linux \
+        --build=i386-unknown-linux
 }
 
 src_compile() {
diff --git a/sysa/libtool-1.4/pass2.sh b/sysa/libtool-1.4/pass2.sh
deleted file mode 100755
index d7ed680..0000000
--- a/sysa/libtool-1.4/pass2.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-src_prepare() {
-    default_src_prepare
-
-    AUTOCONF=autoconf-2.13 AUTOHEADER=autoheader-2.13 ACLOCAL=aclocal-1.4 AUTOMAKE=automake-1.4 ./bootstrap
-}
-
-src_configure() {
-    CC=tcc ./configure \
-      --prefix="${PREFIX}" \
-      --libdir="${PREFIX}/lib/musl" \
-      --disable-shared \
-      --host=i386-unknown-linux \
-      --target=i386-unknown-linux \
-      --build=i386-unknown-linux
-}
diff --git a/sysa/libtool-2.2.4/checksums b/sysa/libtool-2.2.4/checksums
new file mode 100644
index 0000000..9d48a11
--- /dev/null
+++ b/sysa/libtool-2.2.4/checksums
@@ -0,0 +1,2 @@
+456e988e4dce69afc7a00507aa29c89ee69fcfba1bbc6c29bc0aeba244c24539  /after/lib/musl/libltdl.a
+7fabfde77fef225b0f42c8f7d6888c94d88c3a23747076f375862e1bab6e2b3f  /after/lib/musl/libltdl.la
diff --git a/sysa/libtool-2.2.4/libtool-2.2.4.sh b/sysa/libtool-2.2.4/libtool-2.2.4.sh
new file mode 100755
index 0000000..9e67419
--- /dev/null
+++ b/sysa/libtool-2.2.4/libtool-2.2.4.sh
@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    ./bootstrap
+}
+
+src_configure() {
+    CC=tcc ./configure \
+        --prefix="${PREFIX}" \
+        --libdir="${PREFIX}/lib/musl" \
+        --disable-shared \
+        --host=i386-unknown-linux \
+        --target=i386-unknown-linux \
+        --build=i386-unknown-linux
+}
+
+src_compile() {
+    make MAKEINFO=true
+}
+
+src_install() {
+    make install MAKEINFO=true
+}
diff --git a/sysa/run.sh b/sysa/run.sh
index 9be27af..90d3771 100755
--- a/sysa/run.sh
+++ b/sysa/run.sh
@@ -87,12 +87,10 @@ build autoconf-2.13
 
 build autoconf-2.12
 
-build libtool-1.4 pass1.sh checksums/pass1
+build libtool-1.4
 
 build binutils-2.14
 
-build libtool-1.4 pass2.sh checksums/pass2
-
 # Build musl with fewer patches
 build musl-1.1.24 binutils-rebuild.sh checksums/pass3 patches-pass3
 populate_device_nodes
@@ -130,6 +128,8 @@ build automake-1.9.6 stage2.sh
 
 build findutils-4.2.33
 
+build libtool-2.2.4
+
 build gcc-4.0.4 pass1.sh checksums/pass1
 
 build musl-1.2.2