Index: sys/boot/i386/zfsloader/Makefile
===================================================================
--- sys/boot/i386/zfsloader/Makefile	(revision 212022)
+++ sys/boot/i386/zfsloader/Makefile	(working copy)
@@ -3,7 +3,7 @@
 .PATH:	${.CURDIR}/../loader
 
 LOADER=		zfsloader
-NEWVERSWHAT=	"ZFS enabled bootstrap loader" i386
+NEWVERSWHAT=	"ZFS enabled bootstrap loader" x86
 LOADER_ZFS_SUPPORT=yes
 LOADER_ONLY=	yes
 NO_MAN=		yes
Index: sys/boot/i386/efi/Makefile
===================================================================
--- sys/boot/i386/efi/Makefile	(revision 212022)
+++ sys/boot/i386/efi/Makefile	(working copy)
@@ -42,7 +42,7 @@ ${PROG}:	${LDSCRIPT}
 
 CLEANFILES=	vers.c loader.efi
 
-NEWVERSWHAT=	"EFI loader" ${MACHINE_ARCH}
+NEWVERSWHAT=	"EFI loader" x86
 
 vers.c:	${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
 	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
Index: sys/boot/i386/loader/Makefile
===================================================================
--- sys/boot/i386/loader/Makefile	(revision 212022)
+++ sys/boot/i386/loader/Makefile	(working copy)
@@ -6,7 +6,7 @@ MK_SSP=		no
 LOADER?=	loader
 PROG=		${LOADER}.sym
 INTERNALPROG=
-NEWVERSWHAT?=	"bootstrap loader" i386
+NEWVERSWHAT?=	"bootstrap loader" x86
 
 # architecture-specific loader code
 SRCS=		main.c conf.c vers.c