--- elwix/config/ELWIX_i386	2017/08/22 14:36:56	1.6.2.3
+++ elwix/config/ELWIX_i386	2017/12/27 21:13:00	1.6.2.4
@@ -1,4 +1,4 @@
-# $Id: ELWIX_i386,v 1.6.2.3 2017/08/22 14:36:56 misho Exp $
+# $Id: ELWIX_i386,v 1.6.2.4 2017/12/27 21:13:00 misho Exp $
 # $FreeBSD: head/sys/i386/conf/GENERIC 310177 2016-12-16 21:10:37Z jhb $
 
 cpu		I486_CPU
@@ -17,9 +17,11 @@ makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace
 
 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
+options 	IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
 options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	TCP_OFFLOAD		# TCP offload
 options 	SCTP			# Stream Control Transmission Protocol
@@ -124,10 +126,10 @@ device		siis			# SiliconImage SiI3124/SiI3132/SiI3531 
 
 # SCSI Controllers
 device		ahc			# AHA2940 and onboard AIC7xxx devices
-options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
+#options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
 					# output.  Adds ~128k to driver.
-device		ahd			# AHA39320/29320 and onboard AIC79xx devices
-options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
+#device		ahd			# AHA39320/29320 and onboard AIC79xx devices
+#options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
 					# output.  Adds ~215k to driver.
 device		esp			# AMD Am53C974 (Tekram DC-390(T))
 device		hptiop			# Highpoint RocketRaid 3xxx series
@@ -454,9 +456,10 @@ device		crypto			# Required by IPSEC
 ### ELWIX Additional custom settings ...
 
 # Add multiple route table support
-options     ROUTETABLES=16
+#options     ROUTETABLES=16
 
-#device		iscsi_initiator
+device		iscsi
+#device		iser
 
 device		if_bridge
 device		tap
@@ -598,7 +601,6 @@ device		vxlan
 
 #device		disc
 #device		edsc
-options		VIMAGE
 #device		epair
 device		stf