diff --git a/ChangeLog b/ChangeLog
index 433417826..2f83512a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-28  Felix Zielcke  <fzielcke@z-51.de>
+
+	* util/i386/pc/grub-setup.c (setup): Fix 2 incorrect checks
+	when embedding.
+
 2009-07-26  Felix Zielcke  <fzielcke@z-51.de>
 
 	* util/grub-mkconfig.in (package_version): New variable.
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 852b49894..38547e534 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -352,9 +352,9 @@ setup (const char *dir,
 
   if ((unsigned long) core_sectors > embed_region.end - embed_region.start)
     {
-      if (core_sectors > 62 * 512)
+      if (core_sectors > 62)
 	grub_util_warn ("Your core.img is unusually large.  It won't fit in the embedding area.");
-      else if (embed_region.end - embed_region.start < 62 * 512)
+      else if (embed_region.end - embed_region.start < 62)
 	grub_util_warn ("Your embedding area is unusually small.  core.img won't fit in it.");
       else
 	grub_util_warn ("Embedding area is too small for core.img.");