diff --git a/ChangeLog b/ChangeLog
index 73649617..6e03a34f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-24  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* configure.in: Include m4/*.m4.
+
+	* aclocal.m4: Renamed to m4/wget.m4.
+
 2005-06-24  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* configure.in: Use AC_LIB_HAVE_LINKFLAGS instead of
diff --git a/autogen.sh b/autogen.sh
index 1b7f24b2..a33e92b9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -32,7 +32,6 @@
 # Autoconf is not installed (or, more precisely, not found in the
 # PATH).
 
-cat m4/*.m4 > aclocal.m4
 autoheader
 autoconf
 
diff --git a/configure.in b/configure.in
index 5e66dfea..a815aadb 100644
--- a/configure.in
+++ b/configure.in
@@ -32,6 +32,12 @@ dnl
 AC_INIT([src/version.c])
 AC_PREREQ(2.57)
 
+dnl Include the M4 macros we use.
+builtin(include, [m4/wget.m4])dnl
+builtin(include, [m4/lib-ld.m4])dnl
+builtin(include, [m4/lib-link.m4])dnl
+builtin(include, [m4/lib-prefix.m4])dnl
+
 dnl
 dnl What version of Wget are we building?
 dnl
diff --git a/m4/oldaclocal.m4 b/m4/wget.m4
similarity index 99%
rename from m4/oldaclocal.m4
rename to m4/wget.m4
index 6ef1d701..6f41860c 100644
--- a/m4/oldaclocal.m4
+++ b/m4/wget.m4
@@ -1,3 +1,7 @@
+dnl
+dnl Wget-specific Autoconf macros.
+dnl
+
 dnl
 dnl Check for `struct utimbuf'.
 dnl