diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index ed9a1dbae..1d616c7b2 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -1008,7 +1008,7 @@ grub_netbsd_boot (void)
   err = grub_relocator_alloc_chunk_addr (relocator, &curarg,
 					 arg_target, tag_buf_len
 					 + sizeof (struct grub_netbsd_bootinfo)
-					 + tag_count * sizeof (grub_addr_t));
+					 + tag_count * sizeof (grub_uint32_t));
   if (err)
     return err;
 
@@ -1322,6 +1322,8 @@ grub_bsd_load (int argc, char *argv[])
       grub_file_close (file);
     }
 
+  kern_end = ALIGN_PAGE (kern_end);
+
 fail:
 
   if (grub_errno != GRUB_ERR_NONE)