diff --git a/ChangeLog b/ChangeLog
index 2680096e2..ca2412b51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-29  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* stage2/builtins.c (setup_func): Use SECTOR_BITS instead of
+	SECTOR_SIZE to compute BLOCKSIZE.
+
 2000-04-26  OKUJI Yoshinori  <okuji@gnu.org>
 
 	* netboot/depca.c: Copied from Etherboot-4.6.0.
diff --git a/stage2/builtins.c b/stage2/builtins.c
index 785072b35..c56e30742 100644
--- a/stage2/builtins.c
+++ b/stage2/builtins.c
@@ -2751,7 +2751,7 @@ setup_func (char *arg, int flags)
 	    /* OK, check if the Stage 1.5 exists.  */
 	    if (grub_open (stage1_5_map[i].name))
 	      {
-		int blocksize = (filemax + SECTOR_SIZE - 1) / SECTOR_SIZE;
+		int blocksize = (filemax + SECTOR_SIZE - 1) >> SECTOR_BITS;
 		
 		grub_close ();
 		grub_strcpy (config_file, stage2);