diff --git a/ChangeLog b/ChangeLog
index 566bc2836..2cba36f0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-26  Jochen Hoenicke  <jochen@gnu.org>
+
+	* stage2/Makefile.am (libgrub_a_CFLAGS): Enable USE_MD5_PASSWORDS
+	for libgrub.  Previously that was implicitly done by configure.in
+	until the patch from 2001-07-04, which moved that flag from CFLAGS
+	to FSYS_CFLAGS.  Reported by YAMAGUCHI Shingo
+	<shingo@kip.iis.toyama-u.ac.jp>
+
 2001-07-13  OKUJI Yoshinori  <okuji@gnu.org>
 
 	* util/grub-install.in (convert): Recognize the naming scheme
diff --git a/stage2/Makefile.am b/stage2/Makefile.am
index 0d1c292f3..c9e7d3b49 100644
--- a/stage2/Makefile.am
+++ b/stage2/Makefile.am
@@ -20,6 +20,7 @@ libgrub_a_SOURCES = boot.c builtins.c common.c char_io.c cmdline.c \
 libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
 	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
 	-DFSYS_MINIX=1 -DFSYS_REISERFS=1 -DFSYS_VSTAFS=1 \
+	-DUSE_MD5_PASSWORDS=1 \
 	-DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 -fwritable-strings
 
 # Stage 2 and Stage 1.5's.
diff --git a/stage2/Makefile.in b/stage2/Makefile.in
index 793820247..078f5b94e 100644
--- a/stage2/Makefile.in
+++ b/stage2/Makefile.in
@@ -111,6 +111,7 @@ libgrub_a_SOURCES = boot.c builtins.c common.c char_io.c cmdline.c \
 libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
 	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
 	-DFSYS_MINIX=1 -DFSYS_REISERFS=1 -DFSYS_VSTAFS=1 \
+	-DUSE_MD5_PASSWORDS=1 \
 	-DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 -fwritable-strings