Index: defaults.mk
==================================================================
--- defaults.mk
+++ defaults.mk
@@ -53,5 +53,8 @@
 RPC_UMNTALL_ENABLE?=no
 
 # savecore
 CRASHINFO_ENABLE?=no
 DUMPDIR?=/var/crash
+
+# zfs
+ZFS_ENABLE?=no

Index: init.mk
==================================================================
--- init.mk
+++ init.mk
@@ -1,11 +1,11 @@
 # Meta targets
 
 TARGETS+=adjkerntz bootfs cleanvar cleartmp cloned devfs dmesg dumpon fsck \
 	hostname kld ldconfig microcode mixer mount mountlate msgs netif \
 	newsyslog nextboot nfsclient pf pwcheck random root rpc_umntall runshm \
-	savecore swap sysctl sysdb wlans
+	savecore swap sysctl sysdb wlans zfs
 
 DAEMON: pwcheck sysctl sysdb NETWORK SERVERS ldconfig nfsclient cleartmp pflogd
 
 LOGIN: DAEMON dntpd msgs powerd pflogd
 
@@ -152,11 +152,11 @@
 	  `cat /var/db/${mixer}-state`
 .endfor
 
 excludes=${NETFS_TYPES:C/:.*//}
 
-mount: root
+mount: root zfs
 	echo "MRC:$@> Mount local FS."
 	mount -a -t no${excludes:ts,}
 
 mountlate: NETWORK mount cleanvar runshm devd
 	echo "MRC:$@> Mount late FS."
@@ -281,5 +281,12 @@
 	    eval wlan_args=\$${WLANS_$${wlan}_ARGS}; \
 	    ifconfig $${wlan} create wlandev $${dev} $${wlan_args}; \
 	    ifconfig $${wlan} up; \
 	  done; \
 	done
+
+zfs:
+.if empty(ZFS_ENABLE:tl:Mno)
+	zfs mount -va || exit $$? ;\
+	zfs share -a || exit $$? ;\
+	test -r /etc/zfs/exports || touch /etc/zfs/exports
+.endif