diff --git a/sys-kernel/linux-sabayon/Manifest b/sys-kernel/linux-sabayon/Manifest
index 62b685154..484060568 100644
--- a/sys-kernel/linux-sabayon/Manifest
+++ b/sys-kernel/linux-sabayon/Manifest
@@ -99,10 +99,10 @@ EBUILD linux-sabayon-2.6.22.ebuild 1655 RMD160 123dfd5429a5130275ffb268352fa6090
 MD5 fe0b22911235dd741cd5133547b0b106 linux-sabayon-2.6.22.ebuild 1655
 RMD160 123dfd5429a5130275ffb268352fa6090197fef3 linux-sabayon-2.6.22.ebuild 1655
 SHA256 7da2fcd2602d053414f13d25efa06cdcfb49d3d6f189fab853d30d52c424c6d8 linux-sabayon-2.6.22.ebuild 1655
-EBUILD linux-sabayon-2.6.23-r1.ebuild 4263 RMD160 6d4edaa4558f23bf90f19f9c26845fefd3b20ee4 SHA1 c3377969d5b0c46b9fe072f7f5658a118f6235ff SHA256 7cf7293489ce371ae4bec0a0dc14f33c6aec6c40db476b8d950ff0af8fc8ffcd
-MD5 0b2b54416bf233c1f55fafef4b22bf41 linux-sabayon-2.6.23-r1.ebuild 4263
-RMD160 6d4edaa4558f23bf90f19f9c26845fefd3b20ee4 linux-sabayon-2.6.23-r1.ebuild 4263
-SHA256 7cf7293489ce371ae4bec0a0dc14f33c6aec6c40db476b8d950ff0af8fc8ffcd linux-sabayon-2.6.23-r1.ebuild 4263
+EBUILD linux-sabayon-2.6.23-r1.ebuild 4496 RMD160 7456606e20b60f304c87e5d8e5f6a505d1812c9e SHA1 6ba343739deea6318bdeb3a7098a11ab621f5901 SHA256 38d33329e6051b314c5aef1f7213f88b5c361a797fbc245ccdaac414632c5be3
+MD5 d4715da062453f3793ace715c0a21d9c linux-sabayon-2.6.23-r1.ebuild 4496
+RMD160 7456606e20b60f304c87e5d8e5f6a505d1812c9e linux-sabayon-2.6.23-r1.ebuild 4496
+SHA256 38d33329e6051b314c5aef1f7213f88b5c361a797fbc245ccdaac414632c5be3 linux-sabayon-2.6.23-r1.ebuild 4496
 MD5 804f274f5d04c33917407e9e54381921 files/digest-linux-sabayon-2.6.22 262
 RMD160 b4897bef477b64d7289476dfe97f0a584bb3157e files/digest-linux-sabayon-2.6.22 262
 SHA256 0adf95c9c91ec31cfa3bc792a216392f5ebf920841508b2a304360aa1ffa66a4 files/digest-linux-sabayon-2.6.22 262
diff --git a/sys-kernel/linux-sabayon/linux-sabayon-2.6.23-r1.ebuild b/sys-kernel/linux-sabayon/linux-sabayon-2.6.23-r1.ebuild
index 2dbc608b1..16155e580 100644
--- a/sys-kernel/linux-sabayon/linux-sabayon-2.6.23-r1.ebuild
+++ b/sys-kernel/linux-sabayon/linux-sabayon-2.6.23-r1.ebuild
@@ -14,11 +14,12 @@ HOMEPAGE="http://www.sabayonlinux.org"
 DEPEND="
 	>=sys-kernel/genkernel-3.4.9_pre9
 	splash? ( x11-themes/sabayonlinux-artwork )
+	!sys-kernel/sabayon-sources
 	"
 RDEPEND="grub? ( sys-boot/grub )"
-IUSE="splash dmraid grub no_sources"
+IUSE="splash dmraid grub no_sources only_sources"
 
-DESCRIPTION="Official Sabayon Linux kernel images"
+DESCRIPTION="Official Sabayon Linux kernel images and sources"
 MY_P="${PV}/sabayon-sources-${PV}"
 KV_FULL=${KV_FULL/linux/sabayon}
 K_NOSETEXTRAVERSION="1"
@@ -74,71 +75,79 @@ src_unpack() {
 
 src_compile() {
 
-	# disable sandbox	
-	export SANDBOX_ON=0
+	if ! use only_sources; then
 
-	# creating workdirs
-	mkdir -p ${WORKDIR}/boot/grub
-	mkdir ${WORKDIR}/lib
-	mkdir ${WORKDIR}/cache
-	mkdir ${S}/temp
+		# disable sandbox
+		export SANDBOX_ON=0
 
-	einfo "Starting to compile kernel..."
-	cp ${FILESDIR}/${P}-${ARCH}.config ${WORKDIR}/config
-
-	if use grub; then
-		if [ -e "/boot/grub/grub.conf" ]; then
-			cp /boot/grub/grub.conf ${WORKDIR}/boot/grub -p
+		# creating workdirs
+		mkdir -p ${WORKDIR}/boot/grub
+		mkdir ${WORKDIR}/lib
+		mkdir ${WORKDIR}/cache
+		mkdir ${S}/temp
+	
+		einfo "Starting to compile kernel..."
+		cp ${FILESDIR}/${P}-${ARCH}.config ${WORKDIR}/config
+	
+		if use grub; then
+			if [ -e "/boot/grub/grub.conf" ]; then
+				cp /boot/grub/grub.conf ${WORKDIR}/boot/grub -p
+			fi
 		fi
-	fi
 
-	OLDARCH=${ARCH}
-	unset ARCH
-	cd ${S}
-	GK_ARGS=""
-	use splash && GKARGS="${GKARGS} --gensplash=sabayon"
-	use dmraid && GKARGS="${GKARGS} --dmraid"
-	use grub && GKARGS="${GKARGS} --bootloader=grub"
-	genkernel ${GKARGS} \
-		--kerneldir=${S} \
-		--kernel-config=${WORKDIR}/config \
-		--cachedir=${WORKDIR}/cache \
-		--makeopts=-j3 \
-		--tempdir=${S}/temp \
-		--logfile=${WORKDIR}/genkernel.log \
-		--bootdir=${WORKDIR}/boot \
-		--mountboot \
-		--lvm \
-		--luks \
-		--module-prefix=${WORKDIR}/lib \
-		all || die "genkernel failed"
-	ARCH=${OLDARCH}
+		OLDARCH=${ARCH}
+		unset ARCH
+		cd ${S}
+		GK_ARGS=""
+		use splash && GKARGS="${GKARGS} --gensplash=sabayon"
+		use dmraid && GKARGS="${GKARGS} --dmraid"
+		use grub && GKARGS="${GKARGS} --bootloader=grub"
+		genkernel ${GKARGS} \
+			--kerneldir=${S} \
+			--kernel-config=${WORKDIR}/config \
+			--cachedir=${WORKDIR}/cache \
+			--makeopts=-j3 \
+			--tempdir=${S}/temp \
+			--logfile=${WORKDIR}/genkernel.log \
+			--bootdir=${WORKDIR}/boot \
+			--mountboot \
+			--lvm \
+			--luks \
+			--module-prefix=${WORKDIR}/lib \
+			all || die "genkernel failed"
+		ARCH=${OLDARCH}
+
+	fi
 }
 
 src_install() {
 
-	if ! use no_sources; then
+	if ! use no_sources || use only_sources; then
 		kernel-2_src_install || die "sources install failed"
-		cd ${D}/usr/src/linux-${KV_FULL} || die "cannot cd into sources directory"
-		OLDARCH=${ARCH}
-		unset ARCH
-		make distclean || die "cannot run make distclean"
-		cp ${FILESDIR}/${P}-${OLDARCH}.config ${D}/usr/src/linux-${KV_FULL}/.config || die "cannot copy kernel configuration"
-		make prepare modules_prepare || die "cannot run make prepare modules_prepare"
-		ARCH=${OLDARCH}
+		if ! use only_sources; then
+			cd ${D}/usr/src/linux-${KV_FULL} || die "cannot cd into sources directory"
+			OLDARCH=${ARCH}
+			unset ARCH
+			make distclean || die "cannot run make distclean"
+			cp ${FILESDIR}/${P}-${OLDARCH}.config ${D}/usr/src/linux-${KV_FULL}/.config || die "cannot copy kernel configuration"
+			make prepare modules_prepare || die "cannot run make prepare modules_prepare"
+			ARCH=${OLDARCH}
+		fi
 	fi
 
-	insinto /boot
-	doins ${WORKDIR}/boot/*
-	cp -Rp ${WORKDIR}/lib/* ${D}/
-	rm ${D}/lib/modules/${KV_FULL}/source
-	rm ${D}/lib/modules/${KV_FULL}/build
-	ln -s /usr/src/linux-${KV_FULL} ${D}/lib/modules/${KV_FULL}/source
-	ln -s /usr/src/linux-${KV_FULL} ${D}/lib/modules/${KV_FULL}/build
-	if use grub; then
-		if [ -e "${WORKDIR}/boot/grub.conf" ]; then
-			insinto /boot/grub/
-			doins ${WORKDIR}/boot/grub.conf
+	if ! use only_sources; then
+		insinto /boot
+		doins ${WORKDIR}/boot/*
+		cp -Rp ${WORKDIR}/lib/* ${D}/
+		rm ${D}/lib/modules/${KV_FULL}/source
+		rm ${D}/lib/modules/${KV_FULL}/build
+		ln -s /usr/src/linux-${KV_FULL} ${D}/lib/modules/${KV_FULL}/source
+		ln -s /usr/src/linux-${KV_FULL} ${D}/lib/modules/${KV_FULL}/build
+		if use grub; then
+			if [ -e "${WORKDIR}/boot/grub.conf" ]; then
+				insinto /boot/grub/
+				doins ${WORKDIR}/boot/grub.conf
+			fi
 		fi
 	fi
 }