Index: head/sys/amd64/conf/GENERIC
===================================================================
--- head/sys/amd64/conf/GENERIC
+++ head/sys/amd64/conf/GENERIC
@@ -26,6 +26,7 @@
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
+options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	IPSEC			# IP (v4/v6) security
Index: head/sys/arm/conf/std.armv6
===================================================================
--- head/sys/arm/conf/std.armv6
+++ head/sys/arm/conf/std.armv6
@@ -5,6 +5,7 @@
 options 	HZ=1000
 options 	ARM_L2_PIPT		# Only L2 PIPT is supported
 options 	PREEMPTION		# Enable kernel thread preemption
+options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	TCP_HHOOK		# hhook(9) framework for TCP
Index: head/sys/arm/conf/std.armv7
===================================================================
--- head/sys/arm/conf/std.armv7
+++ head/sys/arm/conf/std.armv7
@@ -5,6 +5,7 @@
 options 	HZ=1000
 options 	ARM_L2_PIPT		# Only L2 PIPT is supported
 options 	PREEMPTION		# Enable kernel thread preemption
+options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	TCP_HHOOK		# hhook(9) framework for TCP
Index: head/sys/arm64/conf/GENERIC
===================================================================
--- head/sys/arm64/conf/GENERIC
+++ head/sys/arm64/conf/GENERIC
@@ -26,6 +26,7 @@
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
+options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	IPSEC			# IP (v4/v6) security
Index: head/sys/conf/NOTES
===================================================================
--- head/sys/conf/NOTES
+++ head/sys/conf/NOTES
@@ -802,8 +802,8 @@
 device		mn	# Munich32x/Falc54 Nx64kbit/sec cards.
 
 # Network stack virtualization.
-#options	VIMAGE
-#options	VNET_DEBUG	# debug for VIMAGE
+options	VIMAGE
+options	VNET_DEBUG	# debug for VIMAGE
 
 #
 # Network interfaces:
Index: head/sys/conf/makeLINT.mk
===================================================================
--- head/sys/conf/makeLINT.mk
+++ head/sys/conf/makeLINT.mk
@@ -6,16 +6,13 @@
 clean:
 	rm -f LINT
 .if ${TARGET} == "amd64" || ${TARGET} == "i386"
-	rm -f LINT-VIMAGE LINT-NOINET LINT-NOINET6 LINT-NOIP
+	rm -f LINT-NOINET LINT-NOINET6 LINT-NOIP
 .endif
 
 NOTES=	../../conf/NOTES NOTES
 LINT: ${NOTES} ../../conf/makeLINT.sed
 	cat ${NOTES} | sed -E -n -f ../../conf/makeLINT.sed > ${.TARGET}
 .if ${TARGET} == "amd64" || ${TARGET} == "i386"
-	echo "include ${.TARGET}"	>  ${.TARGET}-VIMAGE
-	echo "ident ${.TARGET}-VIMAGE"	>> ${.TARGET}-VIMAGE
-	echo "options VIMAGE"		>> ${.TARGET}-VIMAGE
 	echo "include ${.TARGET}"	>  ${.TARGET}-NOINET
 	echo "ident ${.TARGET}-NOINET"	>> ${.TARGET}-NOINET
 	echo 'makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="'  >> ${.TARGET}-NOINET
Index: head/sys/i386/conf/GENERIC
===================================================================
--- head/sys/i386/conf/GENERIC
+++ head/sys/i386/conf/GENERIC
@@ -28,6 +28,7 @@
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
+options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	IPSEC			# IP (v4/v6) security
Index: head/sys/mips/conf/GXEMUL
===================================================================
--- head/sys/mips/conf/GXEMUL
+++ head/sys/mips/conf/GXEMUL
@@ -30,6 +30,7 @@
 options 	SMP			# Symmetric MultiProcessor Kernel
 
 options 	SCHED_ULE
+options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	TCP_HHOOK		# hhook(9) framework for TCP
Index: head/sys/mips/conf/GXEMUL32
===================================================================
--- head/sys/mips/conf/GXEMUL32
+++ head/sys/mips/conf/GXEMUL32
@@ -28,6 +28,7 @@
 options 	SMP			# Symmetric MultiProcessor Kernel
 
 options 	SCHED_ULE
+options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	TCP_HHOOK		# hhook(9) framework for TCP
Index: head/sys/mips/conf/QEMU
===================================================================
--- head/sys/mips/conf/QEMU
+++ head/sys/mips/conf/QEMU
@@ -31,6 +31,7 @@
 options 	KDB
 
 options 	SCHED_4BSD		#4BSD scheduler
+options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			#InterNETworking
 options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	NFSCL			#Network Filesystem Client
@@ -44,6 +45,11 @@
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
 #options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+# Note that 'bpf' is required for DHCP.
+device		bpf			# Berkeley packet filter
 
 device		loop
 device		ether
Index: head/sys/net/vnet.c
===================================================================
--- head/sys/net/vnet.c
+++ head/sys/net/vnet.c
@@ -312,9 +312,8 @@
 vnet0_init(void *arg __unused)
 {
 
-	/* Warn people before take off - in case we crash early. */
-	printf("WARNING: VIMAGE (virtualized network stack) is a highly "
-	    "experimental feature.\n");
+	if (bootverbose)
+		printf("VIMAGE (virtualized network stack) enabled\n");
 
 	/*
 	 * We MUST clear curvnet in vi_init_done() before going SMP,
Index: head/sys/powerpc/conf/GENERIC
===================================================================
--- head/sys/powerpc/conf/GENERIC
+++ head/sys/powerpc/conf/GENERIC
@@ -35,6 +35,7 @@
 options		FDT
 options 	SCHED_ULE		#ULE scheduler
 options 	PREEMPTION		#Enable kernel thread preemption
+options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	IPSEC			# IP (v4/v6) security
Index: head/sys/powerpc/conf/GENERIC64
===================================================================
--- head/sys/powerpc/conf/GENERIC64
+++ head/sys/powerpc/conf/GENERIC64
@@ -35,6 +35,7 @@
 options		FDT			#Flattened Device Tree
 options 	SCHED_ULE		#ULE scheduler
 options 	PREEMPTION		#Enable kernel thread preemption
+options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	TCP_HHOOK		# hhook(9) framework for TCP
Index: head/sys/riscv/conf/GENERIC
===================================================================
--- head/sys/riscv/conf/GENERIC
+++ head/sys/riscv/conf/GENERIC
@@ -30,6 +30,7 @@
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
+options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	TCP_HHOOK		# hhook(9) framework for TCP
Index: head/sys/sparc64/conf/GENERIC
===================================================================
--- head/sys/sparc64/conf/GENERIC
+++ head/sys/sparc64/conf/GENERIC
@@ -28,6 +28,7 @@
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
+options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	IPSEC			# IP (v4/v6) security