diff --git a/ChangeLog b/ChangeLog
index 62772d1ca..6043b2694 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-24  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* stage2/builtins.c [GRUB_UTIL]: Include stdio.h before
+	shared.h. Reported by Mathieu Chouquet-Stringer
+	<mchouque@cs.stevens-tech.edu>.
+	
 2000-08-21  OKUJI Yoshinori  <okuji@gnu.org>
 
 	* configure.in (--enable-serial-speed-emulation): New option.
diff --git a/stage2/builtins.c b/stage2/builtins.c
index 09c5f785f..01f0f95d8 100644
--- a/stage2/builtins.c
+++ b/stage2/builtins.c
@@ -19,6 +19,12 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+/* Include stdio.h before shared.h, because we can't define
+   WITHOUT_LIBC_STUBS here.  */
+#ifdef GRUB_UTIL
+# include <stdio.h>
+#endif
+
 #include <shared.h>
 #include <filesys.h>
 
@@ -31,7 +37,6 @@
 #endif
 
 #ifdef GRUB_UTIL
-# include <stdio.h>
 # include <device.h>
 #else /* ! GRUB_UTIL */
 # include <apic.h>