diff --git a/ChangeLog b/ChangeLog
index 1963a4beb..2d6319368 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-17  Pavel Roskin  <proski@gnu.org>
+
+	* stage2/char_io.c (safe_parse_maxint): Disable for stage 1.5.
+	(grub_tolower): Disable for stage 1.5 except fat_stage1_5.
+	(grub_memcmp): Disable for stage 1.5 except iso9660_stage1_5.
+
 2004-05-14  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	From Sergey Matveychuk <sem@ciam.ru>:
diff --git a/stage2/char_io.c b/stage2/char_io.c
index b89f3bd50..3ff110bbc 100644
--- a/stage2/char_io.c
+++ b/stage2/char_io.c
@@ -842,7 +842,6 @@ get_cmdline (char *prompt, char *cmdline, int maxlen,
   setcursor (old_cursor);
   return ret;
 }
-#endif /* STAGE1_5 */
 
 int
 safe_parse_maxint (char **str_ptr, int *myint_ptr)
@@ -897,7 +896,9 @@ safe_parse_maxint (char **str_ptr, int *myint_ptr)
 
   return 1;
 }
+#endif /* STAGE1_5 */
 
+#if !defined(STAGE1_5) || defined(FSYS_FAT)
 int
 grub_tolower (int c)
 {
@@ -906,6 +907,7 @@ grub_tolower (int c)
 
   return c;
 }
+#endif /* ! STAGE1_5 || FSYS_FAT */
 
 int
 grub_isspace (int c)
@@ -916,6 +918,7 @@ grub_isspace (int c)
   return 0;
 }
 
+#if !defined(STAGE1_5) || defined(FSYS_ISO9660)
 int
 grub_memcmp (const char *s1, const char *s2, int n)
 {
@@ -932,6 +935,7 @@ grub_memcmp (const char *s1, const char *s2, int n)
 
   return 0;
 }
+#endif /* ! STAGE1_5 || FSYS_ISO9660 */
 
 #ifndef STAGE1_5
 int