diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index 97f4d3cb8d4a..09184171fe5f 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -18,7 +18,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600004
+%VERSREQ=	600012
 
 STD8X16FONT?=	iso
 
@@ -37,8 +37,6 @@ INCLUDES+= -I$S/contrib/libfdt
 CFLAGS+=	-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
 .endif
 
-MKMODULESENV+= MACHINE=amd64
-
 # XXX: clang integrated-as doesn't grok .codeNN directives yet
 ASM_CFLAGS.acpi_wakecode.S=	${CLANG_NO_IAS}
 ASM_CFLAGS.mpboot.S=		${CLANG_NO_IAS}
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index d3332b494fe4..95184f3bec93 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600004
+%VERSREQ=	600012
 
 STD8X16FONT?=	iso
 
@@ -126,8 +126,6 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$M/inckern.S $S/$M/$M/elf_trampoline.c
 	rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \
 	    inflate-tramp.o tmphack.S
 
-MKMODULESENV+=	MACHINE=${MACHINE}
-
 %BEFORE_DEPEND
 
 %OBJS
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 4651e8d2c9be..e2f72bf7f397 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600004
+%VERSREQ=	600012
 
 STD8X16FONT?=	iso
 
@@ -32,10 +32,6 @@ S=	../../..
 
 INCLUDES+= -I$S/contrib/libfdt
 
-MACHINE=i386
-
-MKMODULESENV+=	MACHINE=${MACHINE}
-
 # XXX: clang integrated-as doesn't grok .codeNN directives yet
 ASM_CFLAGS.acpi_wakecode.S=	${CLANG_NO_IAS}
 ASM_CFLAGS.mpboot.s=		${CLANG_NO_IAS}
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index f736866f14e7..de4d41c474cb 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600004
+%VERSREQ=	600012
 
 STD8X16FONT?=	iso
 
diff --git a/sys/conf/Makefile.mips b/sys/conf/Makefile.mips
index 69eea9eaff81..09eca75299ef 100644
--- a/sys/conf/Makefile.mips
+++ b/sys/conf/Makefile.mips
@@ -15,7 +15,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600004
+%VERSREQ=	600012
 
 STD8X16FONT?=	iso
 
@@ -39,8 +39,6 @@ KERNLOADADDR?=0x80001000
 # To be changed later
 TRAMPLOADADDR?=0x807963c0
 
-MKMODULESENV+=	MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH}
-
 # We default to the MIPS32 ISA, if none specified in the
 # kernel configuration file.
 ARCH_FLAGS?=-march=mips32
@@ -60,7 +58,6 @@ TRAMP_ELFSIZE=64
 TRAMP_ELFSIZE=32
 .endif
 
-# XXX hardcoded kernel entry point
 ASM_CFLAGS+=${CFLAGS} -D_LOCORE -DLOCORE
 
 .if !defined(WITHOUT_KERNEL_TRAMPOLINE)
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index e3a265db0578..728261b417b0 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -19,7 +19,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600004
+%VERSREQ=	600012
 
 .if !defined(S)
 .if exists(./@/.)
@@ -30,10 +30,6 @@ S=	../../..
 .endif
 .include "$S/conf/kern.pre.mk"
 
-MACHINE=pc98
-
-MKMODULESENV+=	MACHINE=${MACHINE}
-
 # XXX: clang integrated-as doesn't grok .codeNN directives yet
 ASM_CFLAGS.mpboot.s=		${CLANG_NO_IAS}
 ASM_CFLAGS+=			${ASM_CFLAGS.${.IMPSRC:T}}
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 2abc4d408e86..015efc60ae9c 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600010
+%VERSREQ=	600012
 
 STD8X16FONT?=	iso
 
diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64
index 947ec87ace50..736f9cba3638 100644
--- a/sys/conf/Makefile.sparc64
+++ b/sys/conf/Makefile.sparc64
@@ -17,7 +17,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600004
+%VERSREQ=	600012
 
 STD8X16FONT?=	iso