diff --git a/parts.rst b/parts.rst
index 6aac2fb..2b0001a 100644
--- a/parts.rst
+++ b/parts.rst
@@ -502,6 +502,11 @@ autoconf 2.61
 
 Yet another version of ``autoconf``.
 
+automake 1.9.6
+==============
+
+Latest GNU Automake from 1.9 series. Slightly annoyingly depends itself but it is easy to patch
+to make it buildable with 1.8.5. Then we rebuild ``automake-1.9`` with itself.
 
 bash 3.2.57
 ===========
diff --git a/rootfs.sh b/rootfs.sh
index 701e046..d04fb32 100755
--- a/rootfs.sh
+++ b/rootfs.sh
@@ -258,6 +258,9 @@ get_file https://ftp.gnu.org/gnu/autoconf/autoconf-2.61.tar.bz2
 # bash 3.2.57
 get_file https://ftp.gnu.org/gnu/bash/bash-3.2.57.tar.gz
 
+# automake 1.9.6
+get_file https://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.bz2
+
 # General cleanup
 find tmp -name .git -exec rm -rf \;
 
diff --git a/sysa/automake-1.9.6/stage1.sh b/sysa/automake-1.9.6/stage1.sh
new file mode 100755
index 0000000..95a0da4
--- /dev/null
+++ b/sysa/automake-1.9.6/stage1.sh
@@ -0,0 +1,20 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    sed -i 's/1.8a/1.8.5/; s/ filename-length-max=99//' configure.ac
+    autoreconf-2.61 -f
+}
+
+src_configure() {
+    ./configure --prefix=/after
+}
+
+src_compile() {
+    make MAKEINFO=true
+}
+
+src_install() {
+    make install MAKEINFO=true
+}
diff --git a/sysa/automake-1.9.6/stage2.sh b/sysa/automake-1.9.6/stage2.sh
new file mode 100755
index 0000000..47db82a
--- /dev/null
+++ b/sysa/automake-1.9.6/stage2.sh
@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    autoreconf-2.61 -f
+}
+
+src_configure() {
+    ./configure --prefix=/after
+}
+
+src_compile() {
+    make MAKEINFO=true
+}
+
+src_install() {
+    make install MAKEINFO=true
+}
diff --git a/sysa/run2.sh b/sysa/run2.sh
index 9ace4cc..4cd95d7 100755
--- a/sysa/run2.sh
+++ b/sysa/run2.sh
@@ -9,6 +9,9 @@
 set -e
 . helpers.sh
 
+build automake-1.9.6 stage1.sh
+build automake-1.9.6 stage2.sh
+
 echo "Bootstrapping completed."
 
 exec env - PATH=/after/bin PS1="\w # " bash -i