diff --git a/sys/boot/i386/Makefile b/sys/boot/i386/Makefile
index 6af86425e7f..912714fe2a2 100644
--- a/sys/boot/i386/Makefile
+++ b/sys/boot/i386/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \
-		kgzldr libi386 libfirewire loader
+		gptzfsboot kgzldr libi386 libfirewire loader
 
 # special boot programs, 'self-extracting boot2+loader'
 SUBDIR+=	pxeldr
diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile
index 985c0430db4..930061ff25a 100644
--- a/sys/boot/i386/gptzfsboot/Makefile
+++ b/sys/boot/i386/gptzfsboot/Makefile
@@ -65,7 +65,7 @@ gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o
 zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c
 
 .if ${MACHINE_ARCH} == "amd64"
-beforedepend gptzfsboot.o: machine
+beforedepend zfsboot.o: machine
 CLEANFILES+=	machine
 machine:
 	ln -sf ${.CURDIR}/../../../i386/include machine
diff --git a/sys/boot/zfs/Makefile b/sys/boot/zfs/Makefile
index 723233ce4eb..5a22ecd9d7f 100644
--- a/sys/boot/zfs/Makefile
+++ b/sys/boot/zfs/Makefile
@@ -9,10 +9,20 @@ CFLAGS+=	-I${.CURDIR}/../common -I${.CURDIR}/../.. -I.
 CFLAGS+=	-I${.CURDIR}/../../../lib/libstand
 CFLAGS+=	-I${.CURDIR}/../../cddl/boot/zfs
 
-# XXX need arch-specific bootstrap CFLAGS here
-# 
-CFLAGS+=	-ffreestanding -mpreferred-stack-boundary=2 \
-		-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3
+CFLAGS+=	-ffreestanding
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+CFLAGS+=	-mpreferred-stack-boundary=2
+CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2
+.endif
+.if ${MACHINE_ARCH} == "i386"
+CFLAGS+=	-mno-sse3
+.endif
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "arm"
+CFLAGS+=	-msoft-float
+.endif
+.if ${MACHINE_ARCH} == "amd64"
+CFLAGS+=	-m32 -march=i386
+.endif
 
 CFLAGS+=	-Wformat -Wall