diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c
index 55e2b133cbe..d3710133c01 100644
--- a/sbin/growfs/debug.c
+++ b/sbin/growfs/debug.c
@@ -518,7 +518,8 @@ dbg_dump_frmap(struct fs *sb, const char *comment, struct cg *cgr)
 
 	cp = (unsigned char *)cg_blksfree(cgr);
 	if (sb->fs_old_nspf)
-		e = howmany((sb->fs_old_cpg * sb->fs_old_spc / sb->fs_old_nspf), CHAR_BIT);
+		e = howmany(sb->fs_old_cpg * sb->fs_old_spc / sb->fs_old_nspf,
+		    CHAR_BIT);
 	else
 		e = 0;
 	for (j = 0; j < e; j += 32) {
diff --git a/sbin/newfs_nandfs/newfs_nandfs.c b/sbin/newfs_nandfs/newfs_nandfs.c
index 8ec285dd486..c9e092744d5 100644
--- a/sbin/newfs_nandfs/newfs_nandfs.c
+++ b/sbin/newfs_nandfs/newfs_nandfs.c
@@ -132,7 +132,7 @@ static uint32_t nuserfiles;
 static uint32_t seg_nblocks;
 static uint32_t seg_endblock;
 
-#define SIZE_TO_BLOCK(size) (((size) + (blocksize - 1)) / blocksize)
+#define SIZE_TO_BLOCK(size) howmany(size, blocksize)
 
 static uint32_t
 nandfs_first_block(void)