diff --git a/ChangeLog b/ChangeLog
index 0f528a322..33d2b4a48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-01  Yoshinori K. Okuji <okuji@enbug.org>
+
+	* Makefile.am (AUTOMAKE_OPTIONS): New variable. Specify the
+	required Automake version explicitly.
+	
 2002-06-30  Yoshinori K. Okuji <okuji@enbug.org>
 
 	* stage2/builtins.c [SUPPORT_SERIAL || SUPPORT_HERCULES]
diff --git a/Makefile.am b/Makefile.am
index db7bdbd68..68ddd6b2d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
 # Do not change this order if you don't know what you are doing.
+AUTOMAKE_OPTIONS = 1.5
 SUBDIRS = netboot stage2 stage1 lib grub util docs
 EXTRA_DIST = BUGS MAINTENANCE
diff --git a/Makefile.in b/Makefile.in
index eae71fd83..7770bdbe4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -88,6 +88,7 @@ host_cpu = @host_cpu@
 host_vendor = @host_vendor@
 install_sh = @install_sh@
 
+AUTOMAKE_OPTIONS = 1.5
 SUBDIRS = netboot stage2 stage1 lib grub util docs
 EXTRA_DIST = BUGS MAINTENANCE
 subdir = .
diff --git a/docs/grub.8 b/docs/grub.8
index 52c123e6d..de4cae5e9 100644
--- a/docs/grub.8
+++ b/docs/grub.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB "8" "June 2002" "grub (GNU GRUB 0.93)" FSF
+.TH GRUB "8" "July 2002" "grub (GNU GRUB 0.93)" FSF
 .SH NAME
 grub \- the grub shell
 .SH SYNOPSIS