diff --git a/ChangeLog b/ChangeLog
index 2a641194a6..699c49816f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Fri May 22 20:29:01 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* config.guess: moved into tool/.
+
+	* config.sub: ditto.
+
+	* install-sh: ditto
+
+	* configure.in: follows the moves.
+
+	* LEGAL: ditto.
+
 Fri May 22 20:10:18 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* instruby.rb: moved into tool/.
diff --git a/LEGAL b/LEGAL
index 7a7e825510..991bb4dea9 100644
--- a/LEGAL
+++ b/LEGAL
@@ -68,8 +68,8 @@ configure:
     This configure script is free software; the Free Software Foundation
     gives unlimited permission to copy, distribute and modify it.
 
-config.guess:
-config.sub:
+tool/config.guess:
+tool/config.sub:
 parse.c:
 
   As long as you distribute these files with the file configure, they
diff --git a/configure.in b/configure.in
index baa0930a55..71614f975b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl {
 AC_INIT()
+AC_CONFIG_AUX_DIR(tool)
 
 AC_PREREQ(2.60)
 
@@ -163,7 +164,7 @@ if test ${target_archs+set}; then
 	  when(*",$archs,"*)
 	    ;;
 	  when(*)
-	    cpu=`$SHELL "$srcdir/config.sub" "${archs}-${target_os}" 2>&1` || {
+	    cpu=`$SHELL "$ac_aux_dir/config.sub" "${archs}-${target_os}" 2>&1` || {
 	        AC_MSG_RESULT([failed])
 		AC_MSG_ERROR([$cpu])
 	    }
diff --git a/config.guess b/tool/config.guess
similarity index 100%
rename from config.guess
rename to tool/config.guess
diff --git a/config.sub b/tool/config.sub
similarity index 100%
rename from config.sub
rename to tool/config.sub
diff --git a/install-sh b/tool/install-sh
similarity index 100%
rename from install-sh
rename to tool/install-sh