Index: usr.sbin/makefs/ffs/buf.h
===================================================================
--- usr.sbin/makefs/ffs/buf.h
+++ usr.sbin/makefs/ffs/buf.h
@@ -58,19 +58,19 @@
 	char *		b_data;
 	long		b_bufsize;
 	long		b_bcount;
-	daddr_t		b_blkno;
-	daddr_t		b_lblkno;
+	off_t		b_blkno;
+	off_t		b_lblkno;
 	struct makefs_fsinfo *b_fs;
 
 	TAILQ_ENTRY(buf)	b_tailq;
 };
 
 void		bcleanup(void);
-int		bread(struct vnode *, daddr_t, int, struct ucred *,
+int		bread(struct vnode *, off_t, int, struct ucred *,
     struct buf **);
 void		brelse(struct buf *);
 int		bwrite(struct buf *);
-struct buf *	getblk(struct vnode *, daddr_t, int, int, int, int);
+struct buf *	getblk(struct vnode *, off_t, int, int, int, int);
 
 #define	bdwrite(bp)	bwrite(bp)
 #define	clrbuf(bp)	memset((bp)->b_data, 0, (u_int)(bp)->b_bcount)
Index: usr.sbin/makefs/ffs/buf.c
===================================================================
--- usr.sbin/makefs/ffs/buf.c
+++ usr.sbin/makefs/ffs/buf.c
@@ -57,7 +57,7 @@
 static TAILQ_HEAD(buftailhead,buf) buftail;
 
 int
-bread(struct vnode *vp, daddr_t blkno, int size, struct ucred *u1 __unused,
+bread(struct vnode *vp, off_t blkno, int size, struct ucred *u1 __unused,
     struct buf **bpp)
 {
 	off_t	offset;
@@ -70,7 +70,7 @@
 		printf("%s: blkno %lld size %d\n", __func__, (long long)blkno,
 		    size);
 	*bpp = getblk(vp, blkno, size, 0, 0, 0);
-	offset = (*bpp)->b_blkno * fs->sectorsize + fs->offset;
+	offset = (off_t)(*bpp)->b_blkno * fs->sectorsize + fs->offset;
 	if (debug & DEBUG_BUF_BREAD)
 		printf("%s: blkno %lld offset %lld bcount %ld\n", __func__,
 		    (long long)(*bpp)->b_blkno, (long long) offset,
@@ -173,7 +173,7 @@
 }
 
 struct buf *
-getblk(struct vnode *vp, daddr_t blkno, int size, int u1 __unused,
+getblk(struct vnode *vp, off_t blkno, int size, int u1 __unused,
     int u2 __unused, int u3 __unused)
 {
 	static int buftailinitted;