diff --git a/ChangeLog b/ChangeLog
index 4ebb5f3d..5e3823b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,18 @@
 2009-09-04  Micah Cowan  <micah@cowan.name>
+	
+	* configure.ac: Configured build-aux/ as auxiliarry directory.
 
-	* announce-gen: Imported from gnulib.
-	* update-copyright: Imported from gnulib.
-	* gnupload: Imported from gnulib.
+	* build-aux/compile, build-aux/config.guess,
+	build-aux/config.rpath, build-aux/config.sub, build-aux/depcomp,
+	build-aux/install-sh, build-aux/link-warning.h,
+	build-aux/mdate-sh, build-aux/missing, build-aux/mkinstalldirs,
+	build-aux/texinfo.tex, build-aux/useless-if-before-free,
+	build-aux/vc-list-files, build-aux/ylwrap: Moved from base
+	directory.
+
+	* build-aux/announce-gen: Imported from gnulib.
+	* build-aux/update-copyright: Imported from gnulib.
+	* build-aux/gnupload: Imported from gnulib.
 	* lib/Makefile.am, m4/gnulib-cache.m4, m4/gnulib-comp.m4: Adjusted
 	for announce-gen, update-copyright, and gnupload.
 	
diff --git a/announce-gen b/build-aux/announce-gen
similarity index 100%
rename from announce-gen
rename to build-aux/announce-gen
diff --git a/compile b/build-aux/compile
similarity index 100%
rename from compile
rename to build-aux/compile
diff --git a/config.guess b/build-aux/config.guess
similarity index 100%
rename from config.guess
rename to build-aux/config.guess
diff --git a/config.rpath b/build-aux/config.rpath
similarity index 100%
rename from config.rpath
rename to build-aux/config.rpath
diff --git a/config.sub b/build-aux/config.sub
similarity index 100%
rename from config.sub
rename to build-aux/config.sub
diff --git a/depcomp b/build-aux/depcomp
similarity index 100%
rename from depcomp
rename to build-aux/depcomp
diff --git a/gnupload b/build-aux/gnupload
similarity index 100%
rename from gnupload
rename to build-aux/gnupload
diff --git a/install-sh b/build-aux/install-sh
similarity index 100%
rename from install-sh
rename to build-aux/install-sh
diff --git a/link-warning.h b/build-aux/link-warning.h
similarity index 100%
rename from link-warning.h
rename to build-aux/link-warning.h
diff --git a/mdate-sh b/build-aux/mdate-sh
similarity index 100%
rename from mdate-sh
rename to build-aux/mdate-sh
diff --git a/missing b/build-aux/missing
similarity index 100%
rename from missing
rename to build-aux/missing
diff --git a/mkinstalldirs b/build-aux/mkinstalldirs
similarity index 100%
rename from mkinstalldirs
rename to build-aux/mkinstalldirs
diff --git a/texinfo.tex b/build-aux/texinfo.tex
similarity index 100%
rename from texinfo.tex
rename to build-aux/texinfo.tex
diff --git a/update-copyright b/build-aux/update-copyright
similarity index 100%
rename from update-copyright
rename to build-aux/update-copyright
diff --git a/useless-if-before-free b/build-aux/useless-if-before-free
similarity index 100%
rename from useless-if-before-free
rename to build-aux/useless-if-before-free
diff --git a/vc-list-files b/build-aux/vc-list-files
similarity index 100%
rename from vc-list-files
rename to build-aux/vc-list-files
diff --git a/ylwrap b/build-aux/ylwrap
similarity index 100%
rename from ylwrap
rename to build-aux/ylwrap
diff --git a/cfg.mk b/cfg.mk
index 25f7078e..8b137891 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1 +1 @@
-build_aux = $(srcdir)
+
diff --git a/configure.ac b/configure.ac
index 7f6260bb..067c3cb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ dnl
 AC_MSG_NOTICE([configuring for GNU Wget $PACKAGE_VERSION])
 
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_AUX_DIR([.])
+AC_CONFIG_AUX_DIR([build-aux])
 
 dnl
 dnl Automake setup