--- freebsd-sources-11.0-r1.ebuild.orig	2017-02-28 14:50:50.000000000 -0500
+++ freebsd-sources-11.0-r1.ebuild	2017-03-29 19:30:27.376558000 -0400
@@ -27,12 +27,14 @@
 "
 
 RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
+	zfs? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
 	=sys-freebsd/freebsd-mk-defs-${RV}*
 	!sys-freebsd/virtio-kmod
 	!sys-fs/fuse4bsd
 	!<sys-freebsd/freebsd-sources-9.2_beta1"
 DEPEND="build-kernel? (
 		dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
+		zfs? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
 		>=sys-freebsd/freebsd-usbin-9.1
 		=sys-freebsd/freebsd-mk-defs-${RV}*
 	)"
@@ -54,11 +56,15 @@
 
 pkg_setup() {
 	# Add the required source files.
-	use dtrace && EXTRACTONLY+="cddl/ "
+	if use dtrace || use zfs ; then
+		EXTRACTONLY+="cddl/ "
+	fi
 
 	# WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914
 	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP= WITHOUT_FORMAT_EXTENSIONS="
-	use dtrace || mymakeopts="${mymakeopts} WITHOUT_CDDL="
+	if ! use dtrace && ! use zfs ; then
+		mymakeopts="${mymakeopts} WITHOUT_CDDL="
+	fi
 	use zfs || mymakeopts="${mymakeopts} WITHOUT_ZFS="
 }
 
@@ -135,7 +141,7 @@
 
 	insinto "/usr/src/sys"
 	doins -r "${S}/".
-	if use dtrace ; then
+	if use dtrace || use zfs ; then
 		insinto "/usr/src/cddl"
 		doins -r "${WORKDIR}/cddl/".
 	fi
@@ -163,7 +169,7 @@
 		ewarn "export WITHOUT_CDDL="
 		ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license."
 	fi
-	if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then
+	if ! use dtrace && ! use zfs && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then
 		ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it."
 	fi
 }