diff --git a/.github/workflows/autoconf.yml b/.github/workflows/autoconf.yml
index fbcbfa055..28b4ee12e 100644
--- a/.github/workflows/autoconf.yml
+++ b/.github/workflows/autoconf.yml
@@ -1,5 +1,5 @@
 # Checks that autoconf has been run if configure.ac was updated
-# Assumes that autoconf 2.69 was run, the same as ubuntu 20.04
+# Assumes that autoconf 2.71 was run, the same as ubuntu 22.04
 name: Autoconf Up To Date
 on:
   pull_request:
diff --git a/DEVELOPING.md b/DEVELOPING.md
index 05d7accf3..6ca971319 100644
--- a/DEVELOPING.md
+++ b/DEVELOPING.md
@@ -17,8 +17,8 @@ The script uses the file to generate `localoptions.h` with various features enab
 Following are generated files in the format `<target>: <generator>(<source>)`
 ```
 - configure: autoconf(configure.ac)
-- config.h.in: autoheader(configure.ac)
-- config.h: configure(config.h.in)
+- src/config.h.in: autoheader(configure.ac)
+- src/config.h: configure(src/config.h.in)
 - Makefile: configure(Makefile.in)
 - default_options_guard.h: make(default_options.h)
 ```
diff --git a/Makefile.in b/Makefile.in
index fa674d125..3c1e87de1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,7 +36,6 @@ endif
 OBJ_DIR=./obj
 MAN_DIR=@srcdir@/manpages
 
-
 _COMMONOBJS=dbutil.o buffer.o dbhelpers.o \
 		dss.o bignum.o \
 		signkey.o rsa.o dbrandom.o \
@@ -277,7 +276,7 @@ thisclean:
 			$(OBJ_DIR)/*
 
 distclean: clean tidy
-	-rm -f config.h config.status config.log
+	-rm -f src/config.h config.status config.log
 	-rm -f Makefile test/Makefile
 	-rm -f default_options_guard.h
 
diff --git a/configure b/configure
index ad5de2580..7342d7ada 100755
--- a/configure
+++ b/configure
@@ -2810,7 +2810,7 @@ as_fn_append ac_header_c_list " sys/socket.h sys_socket_h HAVE_SYS_SOCKET_H"
 ac_aux_files="config.guess config.sub"
 
 # Locations in which to look for auxiliary files.
-ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.."
+ac_aux_dir_candidates="${srcdir}/src"
 
 # Search for a directory containing all of the required auxiliary files,
 # $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
@@ -8696,7 +8696,9 @@ fi
 # flags that should be set in Makefile but not for configure tests
 CFLAGS="$CFLAGS $LATE_CFLAGS"
 
-ac_config_headers="$ac_config_headers config.h"
+
+
+ac_config_headers="$ac_config_headers config.h:src/config.h.in"
 
 ac_config_files="$ac_config_files Makefile $LIBTOM_FILES test/Makefile"
 
@@ -9384,7 +9386,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:src/config.h.in" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "$LIBTOM_FILES") CONFIG_FILES="$CONFIG_FILES $LIBTOM_FILES" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index d82818a51..405113c04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -888,7 +888,9 @@ fi
 # flags that should be set in Makefile but not for configure tests
 CFLAGS="$CFLAGS $LATE_CFLAGS"
 
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_AUX_DIR([src])
+
+AC_CONFIG_HEADERS([config.h:src/config.h.in])
 AC_CONFIG_FILES(Makefile $LIBTOM_FILES test/Makefile)
 AC_OUTPUT
 
diff --git a/config.guess b/src/config.guess
similarity index 100%
rename from config.guess
rename to src/config.guess
diff --git a/config.h.in b/src/config.h.in
similarity index 99%
rename from config.h.in
rename to src/config.h.in
index b70731c01..f42d3e458 100644
--- a/config.h.in
+++ b/src/config.h.in
@@ -1,4 +1,4 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
+/* src/config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Using AIX */
 #undef AIX
diff --git a/config.sub b/src/config.sub
similarity index 100%
rename from config.sub
rename to src/config.sub
diff --git a/install-sh b/src/install-sh
similarity index 100%
rename from install-sh
rename to src/install-sh