diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index ef850a423b..dba0ef66a5 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Remove AC_CONFIG_AUX_DIR.
+	* aclocal/rtems-top.m4: Add AC_CONFIG_AUX_DIR.
+
 2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: AC_PREREQ(2.57).
diff --git a/cpukit/aclocal/rtems-top.m4 b/cpukit/aclocal/rtems-top.m4
index 25572244d3..f8c3fc90ec 100644
--- a/cpukit/aclocal/rtems-top.m4
+++ b/cpukit/aclocal/rtems-top.m4
@@ -8,8 +8,8 @@ dnl
 AC_DEFUN(RTEMS_TOP,
 [dnl
 AC_REQUIRE([RTEMS_VERSIONING])
+AC_CONFIG_AUX_DIR([$1])
 AC_CHECK_PROGS(MAKE, gmake make)
-AC_BEFORE([$0], [AC_CONFIG_AUX_DIR])dnl
 AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
 
 AC_PREFIX_DEFAULT([/opt/rtems])
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 1dd7edfd49..34da6bf121 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -6,7 +6,6 @@ AC_PREREQ(2.57)
 AC_INIT([rtems-cpukit],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([score])
 RTEMS_TOP(..)
-AC_CONFIG_AUX_DIR(..)
 
 RTEMS_CANONICAL_TARGET_CPU