diff --git a/stand/i386/gptzfsboot/Makefile b/stand/i386/gptzfsboot/Makefile
--- a/stand/i386/gptzfsboot/Makefile
+++ b/stand/i386/gptzfsboot/Makefile
@@ -1,7 +1,7 @@
 .include <bsd.init.mk>
 
 .PATH:		${BOOTSRC}/i386/boot2 ${BOOTSRC}/i386/gptboot \
-		${BOOTSRC}/i386/zfsboot ${BOOTSRC}/i386/common \
+		${BOOTSRC}/i386/common \
 		${BOOTSRC}/common
 
 FILES=		gptzfsboot
diff --git a/stand/i386/zfsboot/zfsboot.c b/stand/i386/gptzfsboot/zfsboot.c
rename from stand/i386/zfsboot/zfsboot.c
rename to stand/i386/gptzfsboot/zfsboot.c