diff --git a/ChangeLog.gettext b/ChangeLog.gettext
new file mode 100644
index 000000000..402d93250
--- /dev/null
+++ b/ChangeLog.gettext
@@ -0,0 +1,6 @@
+2009-11-16  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* aclocal.m4: Move from here ...
+	* acinclude.m4: ... to here.
+	* autogen.sh: Add call to `aclocal'.
+	* configure.ac: Add AM_INIT_AUTOMAKE() after AC_INIT() call.
diff --git a/aclocal.m4 b/acinclude.m4
similarity index 100%
rename from aclocal.m4
rename to acinclude.m4
diff --git a/autogen.sh b/autogen.sh
index 6751c8adc..8e5a29215 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,6 +2,7 @@
 
 set -e
 
+aclocal
 autoconf
 autoheader
 echo timestamp > stamp-h.in
diff --git a/configure.ac b/configure.ac
index 6287c4f59..3178f6c4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,7 @@ dnl type.
 
 
 AC_INIT([GRUB],[1.97],[bug-grub@gnu.org])
+AM_INIT_AUTOMAKE()
 AC_PREREQ(2.59d)
 AC_CONFIG_SRCDIR([include/grub/dl.h])
 AC_CONFIG_HEADER([config.h])