diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 97afbd189b3..2603605cf67 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -80,7 +80,7 @@ stages:
     - script: sudo apt-get update && sudo apt-get install -y stunnel4 python3-impacket libzstd-dev libbrotli-dev $(install)
       displayName: 'apt install'
 
-    - script: ./buildconf && ./configure --enable-warnings --enable-werror $(configure)
+    - script: autoreconf -fi && ./configure --enable-warnings --enable-werror $(configure)
       displayName: 'configure $(name)'
 
     - script: make V=1 && make V=1 examples && cd tests && make V=1
@@ -107,7 +107,7 @@ stages:
           name: default
           install:
     steps:
-    - script: ./buildconf && ./configure --without-ssl
+    - script: autoreconf -fi && ./configure --without-ssl
       displayName: 'configure $(name)'
 
     - script: make && ./maketgz 99.98.97
@@ -169,8 +169,8 @@ stages:
     - script: sudo apt-get update && sudo apt-get install -y clang-tools-10 clang-9 libssl-dev libssh2-1-dev libpsl-dev libbrotli-dev libzstd-dev
       displayName: 'apt install'
 
-    - script: ./buildconf
-      displayName: 'buildconf'
+    - script: autoreconf -fi
+      displayName: 'autoreconf'
 
     - script: scan-build-10 ./configure --enable-debug --enable-werror --with-openssl --with-libssh2
       displayName: 'configure'
@@ -285,7 +285,7 @@ stages:
       displayName: 'prepare'
       condition: variables.prepare
 
-    - script: $(container_cmd) -l -c "cd $(echo '%cd%') && ./buildconf && ./configure $(configure)"
+    - script: $(container_cmd) -l -c "cd $(echo '%cd%') && autoreconf -fi && ./configure $(configure)"
       displayName: 'configure $(name)'
 
     - script: $(container_cmd) -l -c "cd $(echo '%cd%') && make V=1 && make V=1 examples && cd tests && make V=1"
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8af8fb69cb1..1443c19f22e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,21 +30,21 @@ commands:
     steps:
       - run:
           command: |
-            ./buildconf
+            autoreconf -fi
             ./configure --enable-warnings --enable-werror --with-openssl
 
   configure-openssl-no-verbose:
     steps:
       - run:
           command: |
-            ./buildconf
+            autoreconf -fi
             ./configure --disable-verbose --enable-werror --with-openssl
 
   configure-no-proxy:
     steps:
       - run:
           command: |
-            ./buildconf
+            autoreconf -fi
             ./configure --disable-proxy --enable-werror --with-openssl
 
   install-cares:
@@ -69,7 +69,7 @@ commands:
     steps:
       - run:
           command: |
-            ./buildconf
+            autoreconf -fi
             ./configure --enable-warnings --enable-werror --with-openssl --with-libssh
 
   install-wolfssl:
@@ -98,21 +98,21 @@ commands:
     steps:
       - run:
           command: |
-            ./buildconf
+            autoreconf -fi
             ./configure --enable-warnings --enable-werror --with-openssl --enable-ares
 
   configure-wolfssh:
     steps:
       - run:
           command: |
-            ./buildconf
+            autoreconf -fi
             LDFLAGS="-Wl,-rpath,$HOME/wssh/lib" ./configure --enable-warnings --enable-werror --with-wolfssl=$HOME/wssl --with-wolfssh=$HOME/wssh
 
   configure-cares-debug:
     steps:
       - run:
           command: |
-            ./buildconf
+            autoreconf -fi
             ./configure --enable-debug --enable-werror --with-openssl --enable-ares
 
   build:
diff --git a/.cirrus.yml b/.cirrus.yml
index 85fcc53825d..102a27db03b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -46,7 +46,7 @@ freebsd_task:
     - easy_install "pyOpenSSL<20.0"
     - easy_install "impacket"
   configure_script:
-    - ./buildconf
+    - autoreconf -fi
     # Building with the address sanitizer is causing unexplainable test issues due to timeouts
     #- case `uname -r` in
     #    12.2*)
@@ -120,7 +120,7 @@ windows_task:
   prepare_script: |
     %container_cmd% -l -c "cd $(echo '%cd%') && %prepare%"
   configure_script: |
-    %container_cmd% -l -c "cd $(echo '%cd%') && ./buildconf && ./configure %configure%"
+    %container_cmd% -l -c "cd $(echo '%cd%') && autoreconf -fi && ./configure %configure%"
   compile_script: |
     %container_cmd% -l -c "cd $(echo '%cd%') && make V=1 && make V=1 examples && cd tests && make V=1"
   install_script: |
diff --git a/.github/workflows/linux-hyper.yml b/.github/workflows/linux-hyper.yml
index ba3cf97818a..01b8e801127 100644
--- a/.github/workflows/linux-hyper.yml
+++ b/.github/workflows/linux-hyper.yml
@@ -43,7 +43,7 @@ jobs:
 
     - uses: actions/checkout@v2
 
-    - run: ./buildconf && LDFLAGS="-Wl,-rpath,$HOME/hyper/target/debug" ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }} && make V=1
+    - run: autoreconf -fi && LDFLAGS="-Wl,-rpath,$HOME/hyper/target/debug" ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }} && make V=1
       name: 'configure and build'
 
     - run: make V=1 test-ci
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index ee31f07e017..18c4ca4b885 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -85,8 +85,8 @@ jobs:
 
     - uses: actions/checkout@v2
 
-    - run: ./buildconf && ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }}
-      name: 'configure'
+    - run: autoreconf -fi && ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }}
+      name: 'configure and build'
       env:
         # -Wvla is caused by brotli
         CFLAGS: "-Wno-vla -mmacosx-version-min=${{ matrix.build.macosx-version-min }}"
diff --git a/.github/workflows/mbedtls.yml b/.github/workflows/mbedtls.yml
index 140b601b99a..aa1aa29e97d 100644
--- a/.github/workflows/mbedtls.yml
+++ b/.github/workflows/mbedtls.yml
@@ -42,7 +42,7 @@ jobs:
 
     - uses: actions/checkout@v2
 
-    - run: ./buildconf && LDFLAGS="-Wl,-rpath,$HOME/mbed/lib" ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }} && make V=1
+    - run: autoreconf -fi && LDFLAGS="-Wl,-rpath,$HOME/mbed/lib" ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }} && make V=1
       name: 'configure and build'
 
     - run: make V=1 test-ci
diff --git a/.github/workflows/nss.yml b/.github/workflows/nss.yml
index 6e4a9ee093a..82dd006dfdb 100644
--- a/.github/workflows/nss.yml
+++ b/.github/workflows/nss.yml
@@ -32,8 +32,8 @@ jobs:
 
     - uses: actions/checkout@v2
 
-    - run: ./buildconf
-      name: 'buildconf'
+    - run: autoreconf -fi
+      name: 'autoreconf'
 
     - run: CC=clang-9 CPPFLAGS="-isystem /usr/include/nss" ./configure ${{ matrix.build.configure }}
       name: 'configure with clang'
diff --git a/.github/workflows/rustls.yml b/.github/workflows/rustls.yml
index d02e3717094..c7c1e9cd08b 100644
--- a/.github/workflows/rustls.yml
+++ b/.github/workflows/rustls.yml
@@ -41,7 +41,7 @@ jobs:
 
     - uses: actions/checkout@v2
 
-    - run: ./buildconf && ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }} && make V=1
+    - run: autoreconf -fi && ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }} && make V=1
       name: 'configure and build'
 
     - run: make V=1 test-ci
diff --git a/.github/workflows/wolfssl.yml b/.github/workflows/wolfssl.yml
index ea1fdeb29c5..c78a9b74c38 100644
--- a/.github/workflows/wolfssl.yml
+++ b/.github/workflows/wolfssl.yml
@@ -46,7 +46,7 @@ jobs:
 
     - uses: actions/checkout@v2
 
-    - run: ./buildconf && LDFLAGS="-Wl,-rpath,$HOME/wssl/lib" ./configure --enable-warnings --enable-werror ${{ matrix.build.curl-configure }} && make V=1
+    - run: autoreconf -fi && LDFLAGS="-Wl,-rpath,$HOME/wssl/lib" ./configure --enable-warnings --enable-werror ${{ matrix.build.curl-configure }} && make V=1
       name: 'configure and build'
 
     - run: make V=1 test-ci
diff --git a/.lgtm.yml b/.lgtm.yml
index 932e9c0b523..63eb43c46d2 100644
--- a/.lgtm.yml
+++ b/.lgtm.yml
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -26,6 +26,6 @@ extraction:
         - libssl-dev
     after_prepare: # make sure lgtm.com doesn't use CMake (which generates and runs tests)
       - rm -f CMakeLists.txt
-      - ./buildconf
+      - autoreconf -fi
     configure: # enable as many optional features as possible
       command: ./configure --enable-ares --with-libssh2 --with-gssapi --with-librtmp --with-openssl
diff --git a/.lift/setup.sh b/.lift/setup.sh
index a9bc873b326..62f609f5a4e 100755
--- a/.lift/setup.sh
+++ b/.lift/setup.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
-./buildconf
+autoreconf -fi
 ./configure --with-openssl
 echo "Ran the setup script for Lift including autoconf and executing ./configure --with-openssl"
diff --git a/appveyor.yml b/appveyor.yml
index 696e9601f91..4bedcba9e9a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -289,7 +289,7 @@ build_script:
         ..\builds\libcurl-vc15-x64-%PATHPART%-dll-ssl-dll-ipv6-sspi\bin\curl.exe -V
       ) else (
       if %BUILD_SYSTEM%==autotools (
-        bash.exe -e -l -c "cd /c/projects/curl && ./buildconf && ./configure %CONFIG_ARGS% && make V=1 && make V=1 examples && cd tests && make V=1"
+        bash.exe -e -l -c "cd /c/projects/curl && autoreconf -fi && ./configure %CONFIG_ARGS% && make V=1 && make V=1 examples && cd tests && make V=1"
       )))))
     - if %TESTING%==ON (
         if %BUILD_SYSTEM%==CMake (
diff --git a/scripts/zuul/before_script.sh b/scripts/zuul/before_script.sh
index 10f79f13d4b..91b8403d504 100755
--- a/scripts/zuul/before_script.sh
+++ b/scripts/zuul/before_script.sh
@@ -22,7 +22,7 @@
 ###########################################################################
 set -eo pipefail
 
-./buildconf
+autoreconf -fi
 
 if [ "$NGTCP2" = yes ]; then
   if [ "$TRAVIS_OS_NAME" = linux -a "$GNUTLS" ]; then
diff --git a/scripts/zuul/script.sh b/scripts/zuul/script.sh
index 1a6bc810911..3aed44b9da8 100755
--- a/scripts/zuul/script.sh
+++ b/scripts/zuul/script.sh
@@ -22,7 +22,7 @@
 ###########################################################################
 set -eo pipefail
 
-./buildconf
+autoreconf -fi
 
 if [ "$T" = "coverage" ]; then
   ./configure --enable-debug --disable-shared --disable-threaded-resolver --enable-code-coverage --enable-werror --with-libssh2