diff --git a/config.guess b/build-tools/config.guess
similarity index 100%
rename from config.guess
rename to build-tools/config.guess
diff --git a/config.sub b/build-tools/config.sub
similarity index 100%
rename from config.sub
rename to build-tools/config.sub
diff --git a/install-sh b/build-tools/install-sh
similarity index 100%
rename from install-sh
rename to build-tools/install-sh
diff --git a/build-tools/libafsdep b/build-tools/libafsdep
index 163773d532..f7bfa3a4dc 100644
--- a/build-tools/libafsdep
+++ b/build-tools/libafsdep
@@ -1 +1,6 @@
+config.guess
+config.sub
 git-version
+install-sh
+missing
+mkinstalldirs
diff --git a/missing b/build-tools/missing
similarity index 100%
rename from missing
rename to build-tools/missing
diff --git a/mkinstalldirs b/build-tools/mkinstalldirs
similarity index 100%
rename from mkinstalldirs
rename to build-tools/mkinstalldirs
diff --git a/configure-libafs.in b/configure-libafs.in
index ee91f59cb9..581e8df358 100644
--- a/configure-libafs.in
+++ b/configure-libafs.in
@@ -1,5 +1,6 @@
 AC_PRERQ([2.60])
 AC_INIT([OpenAFS], m4_esyscmd([build-tools/git-version .]))
+AC_CONFIG_AUX_DIR([build-tools])
 AC_CONFIG_SRCDIR(src/libafs/Makefile.common.in)
 AM_INIT_AUTOMAKE
 
diff --git a/configure.in b/configure.in
index f8ca80c4d4..21c9c06b77 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,6 @@
 AC_PREREQ([2.60])
 AC_INIT([OpenAFS], m4_esyscmd([build-tools/git-version .]))
+AC_CONFIG_AUX_DIR([build-tools])
 AC_CONFIG_SRCDIR([src/config/stds.h])
 AM_INIT_AUTOMAKE
 
diff --git a/libafsdep b/libafsdep
index d035d7ebe4..8593a43477 100644
--- a/libafsdep
+++ b/libafsdep
@@ -2,12 +2,6 @@
 # Note, do not copy configure-libafs, or Makefile-libafs, as they are 
 # copied and renamed in the make_libafs_tree.pl script.
 #
-config.guess
-config.sub
-install-sh
-missing
-mkinstalldirs
-#
 # Following are listed in here cause the include/ dir doesn't exist in
 # source tree. For now, just copying everything, though this could easily
 # be shrunk to only copying minimal list of files if you're willing to accept