diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources
index 40ffa97..b415652 100644
--- a/SHA256SUMS.sources
+++ b/SHA256SUMS.sources
@@ -6,6 +6,7 @@ a74aea954f36c7beeb6cc47b96a408c3e04e7ad635f614e65250dbcd8ec0bd28  autoconf-2.54.
 f757158a04889b265203eecd8ca92568e2a67c3b9062fa6bff7a0a6efd2244ac  autoconf-2.55.tar.bz2
 e1035aa2c21fae2a934d1ab56c774ce9d22717881dab8a1a5b16d294fb793489  autoconf-2.57.tar.bz2
 f0cde70a8f135098a6a3e85869f2e1cc3f141beea766fa3d6636e086cd8b90a7  autoconf-2.59.tar.bz2
+93a2ceab963618b021db153f0c881a2de82455c1dc7422be436fcd5c554085a1  autoconf-2.61.tar.bz2
 503cdc2b0992a4309545d17f462cb15f99bb57b7161dfc4082b2e7188f2bcc0f  automake-1.4-p6.tar.gz
 0dbafacaf21e135cab35d357a14bdcd981d2f2d00e1387801be8091a31b7bb81  automake-1.6.3.tar.bz2
 2dddc3b51506e702647ccc6757e15c05323fa67245d2d53e81ed36a832f9be42  automake-1.7.8.tar.bz2
diff --git a/parts.rst b/parts.rst
index bba10bf..6aac2fb 100644
--- a/parts.rst
+++ b/parts.rst
@@ -497,6 +497,12 @@ outputs. This is not strictly required for bootstrapping but will help us to avo
 build process to skip generation of manpages. This is the newest version of ``help2man`` that
 does not require Perl 5.8.
 
+autoconf 2.61
+=============
+
+Yet another version of ``autoconf``.
+
+
 bash 3.2.57
 ===========
 
diff --git a/rootfs.sh b/rootfs.sh
index a98d7e0..701e046 100755
--- a/rootfs.sh
+++ b/rootfs.sh
@@ -252,6 +252,9 @@ get_file https://ftp.gnu.org/gnu/automake/automake-1.8.5.tar.bz2
 # help2man 1.36.4
 get_file https://ftp.gnu.org/gnu/help2man/help2man-1.36.4.tar.gz
 
+# autoconf 2.61
+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
 
diff --git a/sysa/autoconf-2.61/stage1.sh b/sysa/autoconf-2.61/stage1.sh
new file mode 100755
index 0000000..5c363c6
--- /dev/null
+++ b/sysa/autoconf-2.61/stage1.sh
@@ -0,0 +1,30 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    sed -i -e '/AC_PROG_GREP/d' -e '/AC_PROG_SED/d' configure.ac
+    autoreconf-2.59 -f
+
+    # Install autoconf data files into versioned directory
+    for file in */*/Makefile.in */Makefile.in Makefile.in; do
+        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+    done
+}
+
+src_configure() {
+    ./configure --prefix="${PREFIX}" --program-suffix=-2.61
+}
+
+src_compile() {
+    make MAKEINFO=true
+}
+
+src_install() {
+    make install MAKEINFO=true
+
+    ln -sf "${PREFIX}/bin/autoconf-2.61" "${PREFIX}/bin/autoconf"
+    ln -sf "${PREFIX}/bin/autoheader-2.61" "${PREFIX}/bin/autoheader"
+    ln -sf "${PREFIX}/bin/autom4te-2.61" "${PREFIX}/bin/autom4te"
+    ln -sf "${PREFIX}/bin/autoreconf-2.61" "${PREFIX}/bin/autoreconf"
+}
diff --git a/sysa/autoconf-2.61/stage2.sh b/sysa/autoconf-2.61/stage2.sh
new file mode 100755
index 0000000..eeceab1
--- /dev/null
+++ b/sysa/autoconf-2.61/stage2.sh
@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    sed -i -e '/AC_PROG_GREP/d' -e '/AC_PROG_SED/d' configure.ac
+    autoreconf-2.61 -f
+
+    # Install autoconf data files into versioned directory
+    for file in */*/Makefile.in */Makefile.in Makefile.in; do
+        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+    done
+}
+
+src_configure() {
+    ./configure --prefix="${PREFIX}" --program-suffix=-2.61
+}
+
+src_compile() {
+    make MAKEINFO=true
+}
+
+src_install() {
+    make install MAKEINFO=true
+}
diff --git a/sysa/run.sh b/sysa/run.sh
index 7590962..328ef88 100755
--- a/sysa/run.sh
+++ b/sysa/run.sh
@@ -123,6 +123,9 @@ build automake-1.8.5
 
 build help2man-1.36.4
 
+build autoconf-2.61 stage1.sh
+build autoconf-2.61 stage2.sh
+
 build bash-3.2.57
 
 exec bash run2.sh