diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -537,6 +537,7 @@
 # Don't build rarely used, semi-supported architectures unless requested.
 #
 .if defined(EXTRA_TARGETS)
+TARGET_MACHINE_LIST+=	i386
 EXTRA_ARCHES_powerpc=	powerpc powerpcspe
 .endif
 TARGETS?= ${TARGET_MACHINE_LIST}
diff --git a/share/mk/local.sys.machine.mk b/share/mk/local.sys.machine.mk
--- a/share/mk/local.sys.machine.mk
+++ b/share/mk/local.sys.machine.mk
@@ -2,7 +2,7 @@
 .-include <site.sys.machine.mk>
 
 PSEUDO_MACHINE_LIST?= common host host32
-TARGET_MACHINE_LIST?= amd64 arm arm64 i386 powerpc riscv
+TARGET_MACHINE_LIST?= amd64 arm arm64 powerpc riscv
 
 MACHINE_ARCH_host?= ${_HOST_ARCH}
 MACHINE_ARCH_host32?= ${_HOST_ARCH32}