diff --git a/.gitignore b/.gitignore
index aa283ec0..38290256 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,7 +54,6 @@
 /aclocal.m4
 /autom4te.cache
 /config.cache
-/config/*
 /include/config.h
 /include/config.h.in
 /include/config.h.in~
diff --git a/Makefile b/Makefile
index c40c37cc..e2497c18 100644
--- a/Makefile
+++ b/Makefile
@@ -865,7 +865,7 @@ clean-gen:
 		Documentation/Makefile tags TAGS \
 		cscope.files cscope.out cscope.in.out cscope.po.out \
 		config.log include/config.h include/config.h.in~ aclocal.m4 \
-		configure autom4te.cache/ config/
+		configure autom4te.cache/
 
 clean-dep:
 	@echo "Cleaning dependency files"
diff --git a/autogen.sh b/autogen.sh
index 342941bf..4b9ad584 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -63,9 +63,9 @@ echo "   automake:   $(automake --version | head -1)"
 
 rm -rf autom4te.cache
 
-aclocal -I m4 $AL_OPTS &&
-autoconf -I m4 $AC_OPTS &&
-autoheader -I m4 $AH_OPTS ||
+aclocal -I config $AL_OPTS &&
+autoconf -I config $AC_OPTS &&
+autoheader -I config $AH_OPTS ||
 exit 1
 
 # it's better to use helper files from automake installation than
@@ -87,7 +87,6 @@ find_autofile() {
 	exit 1
 }
 
-mkdir -p config/
 find_autofile config.guess
 find_autofile config.sub
 find_autofile install-sh
diff --git a/m4/ax_check_compile_flag.m4 b/config/ax_check_compile_flag.m4
similarity index 100%
rename from m4/ax_check_compile_flag.m4
rename to config/ax_check_compile_flag.m4
diff --git a/m4/ax_check_define.m4 b/config/ax_check_define.m4
similarity index 100%
rename from m4/ax_check_define.m4
rename to config/ax_check_define.m4
diff --git a/m4/ax_gcc_builtin.m4 b/config/ax_gcc_builtin.m4
similarity index 100%
rename from m4/ax_gcc_builtin.m4
rename to config/ax_gcc_builtin.m4
diff --git a/configure.ac b/configure.ac
index 91f2fac7..2432741f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_SUBST([CFLAGS])
 AC_PREREQ([2.60])
 
 AC_CONFIG_AUX_DIR([config])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIR([config])
 dnl AC_USE_SYSTEM_EXTENSIONS must be called before any macros that run
 dnl the compiler (like AC_PROG_LIBTOOL) to avoid autoconf errors.
 AC_USE_SYSTEM_EXTENSIONS