diff --git a/sysa/autoconf-2.52/autoconf-2.52.sh b/sysa/autoconf-2.52/stage1.sh
similarity index 100%
rename from sysa/autoconf-2.52/autoconf-2.52.sh
rename to sysa/autoconf-2.52/stage1.sh
diff --git a/sysa/autoconf-2.52/stage2.sh b/sysa/autoconf-2.52/stage2.sh
new file mode 100755
index 0000000..da084a6
--- /dev/null
+++ b/sysa/autoconf-2.52/stage2.sh
@@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    rm Makefile.in */Makefile.in
+    rm configure
+    autoconf-2.52
+    automake-1.4
+
+    # Install autoconf data files into versioned directory
+    for file in */Makefile.in  Makefile.in; do
+	sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+    done
+}
+
+src_configure() {
+    ./configure --prefix=${PREFIX} --program-suffix=-2.52
+}
+
+src_install() {
+    # Remove manually installed autoconf
+    rm ${PREFIX}/bin/autoconf-2.52
+    rm -rf ${PREFIX}/share/autoconf-2.52
+
+    default_src_install
+}
diff --git a/sysa/run.sh b/sysa/run.sh
index 4b1133b..cf7b430 100755
--- a/sysa/run.sh
+++ b/sysa/run.sh
@@ -68,9 +68,11 @@ build perl-5.6.2
 
 populate_device_nodes
 
-build autoconf-2.52
+build autoconf-2.52 stage1.sh
 
 build automake-1.4-p6 stage1.sh
 build automake-1.4-p6 stage2.sh
 
+build autoconf-2.52 stage2.sh
+
 echo "Bootstrapping completed."