diff --git a/ChangeLog b/ChangeLog
index b984f28fe..b6b65cbe7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-12  Pavel Roskin  <proski@gnu.org>
+
+	* configure.in: enable AM_MAINTAINER_MODE to be consistent with
+	other GNOME modules
+	* autogen.sh: remove "-I ." from the "aclocal" command line
+
 2000-09-01  Pavel Roskin  <proski@gnu.org>
 
 	* configure.in: output vfs/extfs/Makefile
diff --git a/autogen.sh b/autogen.sh
index 80d9eb9ca..cc98a6098 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
 (
 cd $srcdir
 if test -d macros; then
-	aclocal -I . -I macros $ACLOCAL_FLAGS || exit 1
+	aclocal -I macros $ACLOCAL_FLAGS || exit 1
 else
 	if test -f aclocal.m4; then
 		echo Warning: aclocal.m4 cannot be rebuilt
diff --git a/configure.in b/configure.in
index cdd310017..c50ae981c 100644
--- a/configure.in
+++ b/configure.in
@@ -5,6 +5,7 @@ AC_INIT(create_vcs)
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(mc, 4.5.51)
 AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
 
 top_srcdir=`dirname $0`
 AC_SUBST(top_srcdir)