diff --git a/ChangeLog b/ChangeLog
index 08c953a7..41d62a80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-11  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+
+	* autogen.sh: aclocal and autoheader should be executed after
+	libtoolize.  Also add '-I .' to aclocal invocation to check
+	current directory for macros.
+
 2004-12-10  Andrey Kiselev  <dron@remotesensing.org>
 
 	* libtiff/tif_dirwrite.c: Always write TIFFTAG_SUBIFD using LONG type
diff --git a/autogen.sh b/autogen.sh
index 22149381..04c82754 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -x
-aclocal
+libtoolize --force --install --copy
+aclocal -I .
 autoheader
-libtoolize --automake --copy
 automake --foreign --add-missing --copy
 autoconf