diff --git a/build/ac-macros/alloca.m4 b/config/ac-macros/alloca.m4
similarity index 100%
rename from build/ac-macros/alloca.m4
rename to config/ac-macros/alloca.m4
diff --git a/build/ac-macros/character_sets.m4 b/config/ac-macros/character_sets.m4
similarity index 100%
rename from build/ac-macros/character_sets.m4
rename to config/ac-macros/character_sets.m4
diff --git a/build/ac-macros/check_cpu.m4 b/config/ac-macros/check_cpu.m4
similarity index 100%
rename from build/ac-macros/check_cpu.m4
rename to config/ac-macros/check_cpu.m4
diff --git a/build/ac-macros/compiler_flag.m4 b/config/ac-macros/compiler_flag.m4
similarity index 100%
rename from build/ac-macros/compiler_flag.m4
rename to config/ac-macros/compiler_flag.m4
diff --git a/build/ac-macros/ha_archive.m4 b/config/ac-macros/ha_archive.m4
similarity index 100%
rename from build/ac-macros/ha_archive.m4
rename to config/ac-macros/ha_archive.m4
diff --git a/build/ac-macros/ha_berkeley.m4 b/config/ac-macros/ha_berkeley.m4
similarity index 100%
rename from build/ac-macros/ha_berkeley.m4
rename to config/ac-macros/ha_berkeley.m4
diff --git a/build/ac-macros/ha_example.m4 b/config/ac-macros/ha_example.m4
similarity index 100%
rename from build/ac-macros/ha_example.m4
rename to config/ac-macros/ha_example.m4
diff --git a/build/ac-macros/ha_innodb.m4 b/config/ac-macros/ha_innodb.m4
similarity index 100%
rename from build/ac-macros/ha_innodb.m4
rename to config/ac-macros/ha_innodb.m4
diff --git a/build/ac-macros/ha_isam.m4 b/config/ac-macros/ha_isam.m4
similarity index 100%
rename from build/ac-macros/ha_isam.m4
rename to config/ac-macros/ha_isam.m4
diff --git a/build/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4
similarity index 100%
rename from build/ac-macros/ha_ndbcluster.m4
rename to config/ac-macros/ha_ndbcluster.m4
diff --git a/build/ac-macros/ha_tina.m4 b/config/ac-macros/ha_tina.m4
similarity index 100%
rename from build/ac-macros/ha_tina.m4
rename to config/ac-macros/ha_tina.m4
diff --git a/build/ac-macros/large_file.m4 b/config/ac-macros/large_file.m4
similarity index 100%
rename from build/ac-macros/large_file.m4
rename to config/ac-macros/large_file.m4
diff --git a/build/ac-macros/misc.m4 b/config/ac-macros/misc.m4
similarity index 100%
rename from build/ac-macros/misc.m4
rename to config/ac-macros/misc.m4
diff --git a/build/ac-macros/mysqlfs.m4 b/config/ac-macros/mysqlfs.m4
similarity index 100%
rename from build/ac-macros/mysqlfs.m4
rename to config/ac-macros/mysqlfs.m4
diff --git a/build/ac-macros/openssl.m4 b/config/ac-macros/openssl.m4
similarity index 100%
rename from build/ac-macros/openssl.m4
rename to config/ac-macros/openssl.m4
diff --git a/build/ac-macros/readline.m4 b/config/ac-macros/readline.m4
similarity index 100%
rename from build/ac-macros/readline.m4
rename to config/ac-macros/readline.m4
diff --git a/build/ac-macros/sanity.m4 b/config/ac-macros/sanity.m4
similarity index 100%
rename from build/ac-macros/sanity.m4
rename to config/ac-macros/sanity.m4
diff --git a/build/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4
similarity index 100%
rename from build/ac-macros/zlib.m4
rename to config/ac-macros/zlib.m4
diff --git a/configure.in b/configure.in
index b45a02d971c..cb9b43498d7 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ AC_CANONICAL_SYSTEM
 # before we call AM_INIT_AUTOMAKE. Don't forget to also update the 
 # NDB lines below.
 #  -Brian
-sinclude(build/ac-macros/sanity.m4)
+sinclude(config/ac-macros/sanity.m4)
 AM_INIT_AUTOMAKE(mysql, 5.0.3-alpha)
 AM_CONFIG_HEADER(config.h)
 
@@ -37,23 +37,23 @@ MYSQL_TCP_PORT_DEFAULT=3306
 MYSQL_UNIX_ADDR_DEFAULT="/tmp/mysql.sock"
 
 dnl Include m4 
-sinclude(build/ac-macros/alloca.m4)
-sinclude(build/ac-macros/check_cpu.m4)
-sinclude(build/ac-macros/character_sets.m4)
-sinclude(build/ac-macros/compiler_flag.m4)
-sinclude(build/ac-macros/ha_archive.m4)
-sinclude(build/ac-macros/ha_berkeley.m4)
-sinclude(build/ac-macros/ha_example.m4)
-sinclude(build/ac-macros/ha_innodb.m4)
-sinclude(build/ac-macros/ha_isam.m4)
-sinclude(build/ac-macros/ha_ndbcluster.m4)
-sinclude(build/ac-macros/ha_tina.m4)
-sinclude(build/ac-macros/large_file.m4)
-sinclude(build/ac-macros/misc.m4)
-sinclude(build/ac-macros/mysqlfs.m4)
-sinclude(build/ac-macros/openssl.m4)
-sinclude(build/ac-macros/readline.m4)
-sinclude(build/ac-macros/zlib.m4)
+sinclude(config/ac-macros/alloca.m4)
+sinclude(config/ac-macros/check_cpu.m4)
+sinclude(config/ac-macros/character_sets.m4)
+sinclude(config/ac-macros/compiler_flag.m4)
+sinclude(config/ac-macros/ha_archive.m4)
+sinclude(config/ac-macros/ha_berkeley.m4)
+sinclude(config/ac-macros/ha_example.m4)
+sinclude(config/ac-macros/ha_innodb.m4)
+sinclude(config/ac-macros/ha_isam.m4)
+sinclude(config/ac-macros/ha_ndbcluster.m4)
+sinclude(config/ac-macros/ha_tina.m4)
+sinclude(config/ac-macros/large_file.m4)
+sinclude(config/ac-macros/misc.m4)
+sinclude(config/ac-macros/mysqlfs.m4)
+sinclude(config/ac-macros/openssl.m4)
+sinclude(config/ac-macros/readline.m4)
+sinclude(config/ac-macros/zlib.m4)
 
 # Remember to add a directory sql/share/LANGUAGE
 AVAILABLE_LANGUAGES="\