diff --git a/freebsd-sources-9.2_rc1.ebuild b/freebsd-sources-9.2_rc1.ebuild
index fca4feb..1fb23bc 100644
--- a/freebsd-sources-9.2_rc1.ebuild
+++ b/freebsd-sources-9.2_rc1.ebuild
@@ -9,20 +9,25 @@ inherit bsdmk freebsd flag-o-matic toolchain-funcs
 DESCRIPTION="FreeBSD kernel sources"
 SLOT="0"
 
-IUSE="+build-generic profile"
+IUSE="+build-generic +dtrace profile"
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
+	SRC_URI="mirror://gentoo/${SYS}.tar.bz2
+		build-generic? ( mirror://gentoo/${CONTRIB}.tar.bz2
+			mirror://gentoo/${ETC}.tar.bz2
+			mirror://gentoo/${INCLUDE}.tar.bz2
+			mirror://gentoo/${LIB}.tar.bz2 )"
 fi
 
-RDEPEND="=sys-freebsd/freebsd-cddl-${RV}*
+RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
 	=sys-freebsd/freebsd-mk-defs-${RV}*
 	!sys-freebsd/virtio-kmod"
 DEPEND="build-generic? (
-		=sys-freebsd/freebsd-cddl-${RV}*
-		=sys-freebsd/freebsd-usbin-${RV}*
+		dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
+		>=sys-freebsd/freebsd-usbin-8.0
 		=sys-freebsd/freebsd-mk-defs-${RV}*
+		sys-devel/flex
 	)"
 
 RESTRICT="strip binchecks"
@@ -74,9 +79,29 @@ src_configure() {
 
 src_compile() {
 	if use build-generic ; then
+		if ! has_version "=sys-freebsd/freebsd-lib-${RV}*" ; then
+			einfo "Pre-installing includes in include_proper"
+			cd "${WORKDIR}/include"
+			mkdir "${WORKDIR}/include_proper" || die
+			$(freebsd_get_bmake) installincludes \
+				DESTDIR="${WORKDIR}" \
+				INCLUDEDIR="/include_proper"
+			CC="${CC} -isystem ${WORKDIR}/include_proper"
+		fi
+
+		if ! has_version ">=sys-freebsd/freebsd-lib-9.1_beta1" ; then
+			cd "${WORKDIR}/lib/libc"
+			freebsd_src_compile
+			CC="${CC} -L${WORKDIR}/lib/libc"
+			export LD_LIBRARY_PATH="${WORKDIR}/lib/libc"
+		fi
+
+		local myconf
+		! use dtrace && myconf="-DNO_CTF "
+
 		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
-		freebsd_src_compile depend
-		freebsd_src_compile
+		freebsd_src_compile depend ${myconf}
+		freebsd_src_compile ${myconf}
 	else
 		einfo "Nothing to compile.."
 	fi