diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources
index d5459be..317d9f0 100644
--- a/SHA256SUMS.sources
+++ b/SHA256SUMS.sources
@@ -7,6 +7,7 @@ f757158a04889b265203eecd8ca92568e2a67c3b9062fa6bff7a0a6efd2244ac  autoconf-2.55.
 e1035aa2c21fae2a934d1ab56c774ce9d22717881dab8a1a5b16d294fb793489  autoconf-2.57.tar.bz2
 f0cde70a8f135098a6a3e85869f2e1cc3f141beea766fa3d6636e086cd8b90a7  autoconf-2.59.tar.bz2
 93a2ceab963618b021db153f0c881a2de82455c1dc7422be436fcd5c554085a1  autoconf-2.61.tar.bz2
+db11944057f3faf229ff5d6ce3fcd819f565455c152b72cec17ebc1cbb80136b  autoconf-2.65.tar.bz2
 e98ab43bb839c31696a4202e5b6ff388b391659ef2387cf9365019fad17e1adc  automake-1.10.3.tar.bz2
 503cdc2b0992a4309545d17f462cb15f99bb57b7161dfc4082b2e7188f2bcc0f  automake-1.4-p6.tar.gz
 0dbafacaf21e135cab35d357a14bdcd981d2f2d00e1387801be8091a31b7bb81  automake-1.6.3.tar.bz2
diff --git a/parts.rst b/parts.rst
index 5122a56..c1f9224 100644
--- a/parts.rst
+++ b/parts.rst
@@ -521,6 +521,12 @@ automake 1.10.3
 GNU Automake from 1.10 series. ``aclocal`` is slightly patched to work
 with our ``perl``.
 
+autoconf 2.65
+=============
+
+Slightly newer version of GNU Autoconf. At this stage Autoconf is mostly
+backwards compatible but newer versions need newer ``automake``.
+
 gcc 4.0.4
 =========
 
@@ -550,16 +556,3 @@ interactively.  This new version of ``bash`` compiles without any patches,
 provides new features, and is built with GNU readline support so it can be used
 as an interactive shell. ``autoconf-2.61`` is used to regenerate the configure
 script and ``bison`` is used to recreate some included generated files.
-
-autoconf 2.65
-=============
-
-Slightly newer version of GNU Autoconf. At this stage Autoconf is mostly
-backwards compatible but newer versions need newer ``automake``.
-
-xz 5.0.5
-========
-
-XZ Utils is a set of free software command-line lossless data compressors,
-including lzma and xz. In most cases, xz achieves higher compression rates
-than alternatives like gzip and bzip2.
diff --git a/rootfs.sh b/rootfs.sh
index a7988f0..2acbc0f 100755
--- a/rootfs.sh
+++ b/rootfs.sh
@@ -276,6 +276,9 @@ get_file https://ftp.gnu.org/gnu/libtool/libtool-2.2.4.tar.bz2
 # automake 1.10.3
 get_file https://ftp.gnu.org/gnu/automake/automake-1.10.3.tar.bz2
 
+# autoconf 2.65
+get_file https://ftp.gnu.org/gnu/autoconf/autoconf-2.65.tar.bz2
+
 # General cleanup
 find tmp -name .git -exec rm -rf \;
 
diff --git a/sysa/autoconf-2.61/stage2.sh b/sysa/autoconf-2.61/stage2.sh
index eeceab1..0ad6d4f 100755
--- a/sysa/autoconf-2.61/stage2.sh
+++ b/sysa/autoconf-2.61/stage2.sh
@@ -3,7 +3,6 @@
 # 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
diff --git a/sysa/autoconf-2.65/autoconf-2.65.sh b/sysa/autoconf-2.65/autoconf-2.65.sh
new file mode 100755
index 0000000..9f84dd8
--- /dev/null
+++ b/sysa/autoconf-2.65/autoconf-2.65.sh
@@ -0,0 +1,29 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    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.65
+}
+
+src_compile() {
+    make MAKEINFO=true
+}
+
+src_install() {
+    make install MAKEINFO=true
+
+    ln -sf "${PREFIX}/bin/autoconf-2.65" "${PREFIX}/bin/autoconf"
+    ln -sf "${PREFIX}/bin/autoheader-2.65" "${PREFIX}/bin/autoheader"
+    ln -sf "${PREFIX}/bin/autom4te-2.65" "${PREFIX}/bin/autom4te"
+    ln -sf "${PREFIX}/bin/autoreconf-2.65" "${PREFIX}/bin/autoreconf"
+}
diff --git a/sysa/gcc-4.0.4/pass1.sh b/sysa/gcc-4.0.4/pass1.sh
index c2bcbfd..f365cb5 100755
--- a/sysa/gcc-4.0.4/pass1.sh
+++ b/sysa/gcc-4.0.4/pass1.sh
@@ -29,7 +29,7 @@ src_prepare() {
         cd ..
     done
     cd libmudflap
-    autoreconf-2.61 -f
+    AUTOM4TE=autom4te-2.61 autoreconf-2.61 -f
     cd ..
 
     for dir in fixincludes intl libmudflap; do
diff --git a/sysa/gcc-4.0.4/pass2.sh b/sysa/gcc-4.0.4/pass2.sh
index 6a8ade5..7587975 100755
--- a/sysa/gcc-4.0.4/pass2.sh
+++ b/sysa/gcc-4.0.4/pass2.sh
@@ -28,7 +28,7 @@ src_prepare() {
         cd ..
     done
     cd libmudflap
-    autoreconf-2.61 -f
+    AUTOM4TE=autom4te-2.61 autoreconf-2.61 -f
     cd ..
 
     for dir in fixincludes intl libmudflap; do
diff --git a/sysa/run.sh b/sysa/run.sh
index 8ae4f57..5c837af 100755
--- a/sysa/run.sh
+++ b/sysa/run.sh
@@ -132,6 +132,8 @@ build libtool-2.2.4
 
 build automake-1.10.3
 
+build autoconf-2.65
+
 build gcc-4.0.4 pass1.sh checksums/pass1
 
 build musl-1.2.2
diff --git a/sysa/run2.sh b/sysa/run2.sh
index cb2a32a..b63c38a 100755
--- a/sysa/run2.sh
+++ b/sysa/run2.sh
@@ -10,10 +10,6 @@ set -e
 
 . helpers.sh
 
-build autoconf-2.65
-
-build xz-5.0.5
-
 echo "Bootstrapping completed."
 
 exec env - PATH=/after/bin PS1="\w # " bash -i