diff --git a/ChangeLog b/ChangeLog
index 061fadc18..019049bb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-05  Yves Blusseau  <yves.blusseau@zetam.org>
+
+	* util/sparc64/ieee1275/grub-mkimage.c (main): Typo fix.
+
+2010-01-05  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/mkisofs/write.c (padblock_write): Switch size and nmemb
+	arguments to fread so that we get a return value in bytes, rather
+	than something that will normally be rounded down to 0.
+	Adjust error handling to avoid producing garbage when size_t is not
+	the same size as long long.
+
 2010-01-05  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/mkisofs/write.c (padblock_write): Check return value of
diff --git a/util/mkisofs/write.c b/util/mkisofs/write.c
index d9b1fd05d..5447229c8 100644
--- a/util/mkisofs/write.c
+++ b/util/mkisofs/write.c
@@ -1437,9 +1437,9 @@ static int FDECL1(padblock_write, FILE *, outfile)
       if (! fp)
 	error (1, errno, _("Unable to open %s"), boot_image_embed);
 
-      if (fread (buffer, 2048 * PADBLOCK_SIZE, 1, fp) == 0)
-	error (1, errno, _("cannot read %llu bytes from %s"),
-	       (size_t) (2048 * PADBLOCK_SIZE), boot_image_embed);
+      if (fread (buffer, 1, 2048 * PADBLOCK_SIZE, fp) == 0)
+	error (1, errno, _("cannot read %d bytes from %s"),
+	       2048 * PADBLOCK_SIZE, boot_image_embed);
       if (fgetc (fp) != EOF)
 	error (1, 0, _("%s is too big for embed area"), boot_image_embed);
     }
diff --git a/util/sparc64/ieee1275/grub-mkimage.c b/util/sparc64/ieee1275/grub-mkimage.c
index b79bbeb41..96ddfe3d7 100644
--- a/util/sparc64/ieee1275/grub-mkimage.c
+++ b/util/sparc64/ieee1275/grub-mkimage.c
@@ -223,7 +223,7 @@ main (int argc, char *argv[])
 
   set_program_name (argv[0]);
 
-  grub_util_init_ls ();
+  grub_util_init_nls ();
 
   while (1)
     {