diff --git a/profiles/pentoo/base/package.accept_keywords/sys-kernel b/profiles/pentoo/base/package.accept_keywords/sys-kernel
index b729290bf..9dbac918f 100644
--- a/profiles/pentoo/base/package.accept_keywords/sys-kernel
+++ b/profiles/pentoo/base/package.accept_keywords/sys-kernel
@@ -3,3 +3,4 @@ sys-kernel/linux-firmware
 sys-kernel/spl
 
 =sys-kernel/genkernel-3.4.41
+=sys-kernel/genkernel-3.4.41-r1
diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask
index 68017fd31..4b4e5c5b4 100644
--- a/profiles/pentoo/base/package.mask
+++ b/profiles/pentoo/base/package.mask
@@ -11,7 +11,7 @@
 net-wireless/madwifi-ng-tools
 >net-wireless/gnome-bluetooth-3
 
->sys-kernel/genkernel-3.4.41
+>sys-kernel/genkernel-3.4.41-r1
 
 #we don't want beta of ati-drivers, they are unstable enough
 =x11-drivers/ati-drivers-12.9_beta
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index a72d78463..3d052b2e1 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -6,6 +6,7 @@ AUX aufs-correct-hacked.diff 17462 SHA256 6e41a271bcb8db75930fb5dcc2ec655381d10d
 AUX aufs-reference.diff 18177 SHA256 39288c4d53614f4b4ca451de4c4ad376f1e8377ea8909424a1d82f04dbe999d1 SHA512 6c51372e3495fe053a61f91a793fa5a251eef8de31097194f6edaa51ec45e8597ed08f8a0559e66dcbeaef692bf5d8e68e957641c15358d7477486ce611e40c2 WHIRLPOOL 521e7f8e2f0da0c52b27122a537e97ed65d1204e91b824f515a033b9fafff46d4251f377be6fefd661d36758c9c337a37c4c1a3578a2b7b49ad5a51c4a29d0bc
 AUX genkernel.bash 2438 SHA256 e7de9771ba79ef878e2c9a21a1c1720f092c6047d3cc7d4a49ff6b90e7e2c248 SHA512 2bfe23606f919577bb2d174ffe18cd00fbb4ce642fb8860b319e059745d46ff8459b99374159f78af9f3aebb0a352a74ccd74c3be581980f5e298293b96e983d WHIRLPOOL 71a6be56d38c24c3032fec5f4016c92dd0bc8140e5204db9d97c5cc5be42a2465282f36e213858b528d013ff74c6bcbf9aa443a77a8ed3ce8174baa79afe6004
 AUX initramfs.mounts 816 SHA256 57ba8450e3f09edc9a4e5a1be15d49c77e4e014e27c626e9e3771167cbb54e49 SHA512 97e5f92d135cff3911a68c7f1afd0f781ec1c1b794cdc824d74f8c119104ecb40bd7180be8414dc72f3a5a811143d6b4bf443ac1d3ff7a71b1e88cbf7c179665 WHIRLPOOL f39d27de6e69b3555f81138a59f25b104f9dd6aa6254a5391d3375b15acaac48f0e698f3e6f96ed88845b84fbf8fa2cd64b98281df977c12a99ec7d9ddaf2a10
+AUX zfs-fix.patch 1681 SHA256 36190e751d49a754e00fb6f9bd4600dde850e8712d48d0728867ff5c1a280780 SHA512 b68f17c03f9cfd1bc6cd2d1bb635374943087d01f6c4c023f2524fc20372d5c5d21b9ab3c396fd5c968138638ea2dbcf67e8129eed6efa8deb2d086e95ef9fe5 WHIRLPOOL bb92c8e310c4be67cd450af5f2d0cd64f82eda89d5ed241330df12cf2281729687d964e98f329d9078a0edbd3ae0198b1d04d4d76107e1b11d6b4d3fcb76ac9e
 DIST LVM2.2.02.74.tgz 943084 SHA256 a40c80c5b9a2547b8bd63e9321d7037c8bf041a35f734a5766ad2848d80bb697 SHA512 c41701fb9e5d52da06a770e93346631e078cdae639ae707dee59dd4d51e8a0eb7ec56f0a685fac014106972833eea98d1f0a100009eac5cf332a4b8463b26dba WHIRLPOOL 3b1a2a791a9278aa892d90361c8a3765978d10cd89398664759a083659b84cc1d0560a2aeb16623afa86c97663cbcfbdd251a6d69245f7db48df272214721f42
 DIST LVM2.2.02.88.tgz 1029151 SHA256 a129d1d3949524da7d6d2a67218254baea02df06a6744faa5808a4182b2fb432 SHA512 5c334c2c78220f4f9f082a74cbf0b156e96f2a07b5e55f054ff70c752ada97a67f83fa1d89c02accb7cbe5a62e356588831d96a102b7bf16cdce2591d4e37e4b WHIRLPOOL b30a1f2403e71ff6fb381ec82291018632e1d10258dd615efae4e39077a304a66271013247793390f57c26886599d8bad8f4b896d230f3e4f846e74c12282f71
 DIST busybox-1.18.1.tar.bz2 2129404 SHA256 33eb25ea7b20c727c3af769256b21408a1ac1f927ff9f89a1f1e3767c18c9967 SHA512 2b4b52d1f7fa07a6b7af4de63a42d52e7db73fdfe88e7f181f54b3a8a821e8336896c48183df5936ba94b9558fb70b58abfbcc889010a7b21359fb391fe516c0 WHIRLPOOL 75e62a032d602629f04e0ae3df2723d495ef5fdc583bbc968151a421ae1bbf554922f9f081dd3bfe4e716cd991317580a2a13aa67d58dddbec7557655393e5f9
@@ -31,6 +32,7 @@ DIST unionfs-fuse-0.24.tar.bz2 30381 SHA256 d8abc855eb618ac356b1e716599c82f8f0f7
 EBUILD genkernel-3.4.30.ebuild 5675 SHA256 d54cd65c75bce9fad988a807db08e671465998bea292f704b7f815cba8dcbbcf SHA512 66810414ce7e14c0b0121eba86f8ea0018a3d24bee84f942cd36200aa26dfc7bb25da2539942f89cc923c2d31d31b21442f32cc96352305c0e3e796272f2c6a5 WHIRLPOOL 75dee8000b995a538ca842160c2381077e34bf090eecbee4d7cce443f7452b79f77e01f014310ddbfbc07f5730cdb38aff424d534286881a058ebb90bf2b116c
 EBUILD genkernel-3.4.32.ebuild 5677 SHA256 7ffa9daa56da3768bdc03194479d27d1fa57cf8f6b377ad88ce1bc092015b4c4 SHA512 3b3554aad18f46014f0a69f7ced9663bb009907b29d7ca57b2afac5e4754d6248535f017f0af2620ab34d2122b53429041a9807cb9a3c9f6d2d6c957cb1bfa95 WHIRLPOOL 3ca091fc6f4f2ce4e3012e3ed5dc3c27fe8988ef7369b7806a75d4b5fc36249eeefe9c792c3d57c79c5389a1b357a9289660a9f3fee5c8c83db48197dface57c
 EBUILD genkernel-3.4.33.1.ebuild 5478 SHA256 3d6fb20a9ba82ac0f664fad64d47228208597170161d2227362c019e7b026a5c SHA512 0e48a733234b56819f3d17884f4a5cf16e2311e53b75947ae828ba6dd44aa96b8a5ea54288b4d3dc472ef5b6ab354cad10d4f503613efed280abb94df5d89f3c WHIRLPOOL 8e6b2279559bec6823489c97cbed98f333225fa56bf526e79b9080bcada205d3a6fdaf64fab63b0ce2070ab8103e6a0ae45a6840018412e289fb5833e77f46a6
+EBUILD genkernel-3.4.41-r1.ebuild 5185 SHA256 ecc93b0d6e47a1c2e1dc93df6e6dca556806d98ace443c5da12c5b19328567aa SHA512 29b4843130e02d9b5327a118a590104fa6a12fda0f9709acca1d1be88b1124241235dbfee3dc97cecf08c2269c70e189346a82f02617cf2cc9de3599a2315017 WHIRLPOOL a389478132a1b9f6b8afb00c1fea08514bfb9ed671b083a96fcb1b459db442882e01f303744e1a668f926e2035b2a22794e7262237ac91b7e5091447a58515fb
 EBUILD genkernel-3.4.41.ebuild 5149 SHA256 6b267a0a3d30bffc1b478190bddc6ffeb480ebb6cde49a705ea7e5589701f880 SHA512 973e128bb0c1420fbad18c31132ba97a1d0406ab6bcf7d3343c1691a7ebecb7ea122879a61240f3714918536a8933883aed1eaf16e798472f483a3df2887850b WHIRLPOOL acb7d065ed5d194e3fa7e8e4229be68d4c74e2b03737b1c12b7ad90ebe6e75fff692dd48aa2ea390fb0de7e4163c5bdf676e7228046ffd44ccfc9a95c446d151
 EBUILD genkernel-9999.2540.ebuild 5009 SHA256 54e051c18952c325edb2432a0eceaa5472e2209afd442f198eec47109e1d50f6 SHA512 b77d443b2f967e0cf5ea337788db92fd6f840b22faed367bfe8a1d791917f49ec36e7ed9013b776c845d0679dd468f150e66c8c3998477ab43a192fbe1dd2fa1 WHIRLPOOL f49d3a172d5a5d1826fcbacad8d79212085f6a9007062d644a07590572a0f63dec743d4bf7bbb02b936b865616816035593406a6e8a3ef39179d3b92f7868c09
 EBUILD genkernel-9999.2998.ebuild 5009 SHA256 9d33c03cd3d32f34620e2a36c3d0e11416fe40da9b3e081e15ffcc3429289bfd SHA512 6f422752a95cff10460bf2d8ff95731889b03a758d6fb9464f44d118c15f2a2cd48f063c8ceee21e8d397ee3cd90df99f66236ab7ddd9167278b83bf37de066a WHIRLPOOL 8187aafde2b43b03bfa69bbfcaf43dc2a9661cb097e3ddf51d2aa6135fa72e0e1d3510c264357537da5d69f86b18944675953772718845d520eb20ed4fa8e4d1
diff --git a/sys-kernel/genkernel/files/zfs-fix.patch b/sys-kernel/genkernel/files/zfs-fix.patch
new file mode 100644
index 000000000..540efb7b0
--- /dev/null
+++ b/sys-kernel/genkernel/files/zfs-fix.patch
@@ -0,0 +1,40 @@
+From: Richard Yao <ryao@gentoo.org>
+Date: Mon, 5 Nov 2012 18:32:08 +0000 (-0500)
+Subject: Make missing ZFS config file failures into warnings, bug #438200
+X-Git-Tag: v3.4.45
+X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fgenkernel.git;a=commitdiff_plain;h=e4af35fdfcd6115741982fe0371d1b6b5f8c6db4
+
+Make missing ZFS config file failures into warnings, bug #438200
+
+Whenever /etc/zfs/{zdev.conf,zpool.cache} was missing, we would fail.
+zpool.cache is not generated during cross compilation, which causes a
+failure in Catalyst when building LiveCDs. Users that do not follow a
+strict set of installation instructions can also suffer failures as a
+consequence of this.
+
+zpool.cache includes information about known pools that enables ZFS to
+detect situations where an entire pool disappears. It is also required
+to do pool import in corner cases, such as those those involving
+file-based pools, and has the beneficial effect of reducing pool import
+times.  Unconditional omission of zpool.cache in general is not an
+option, but for the situations identified, it is okay to convert the
+failure into a warning, which is what we do.
+
+Reported-by: Rick Farina <zero_chaos@gentoo.org>
+Reported-by: Alexander Zubkov <green@msu.ru>
+Signed-off-by: Richard Yao <ryao@gentoo.org>
+---
+
+diff --git a/gen_initramfs.sh b/gen_initramfs.sh
+index 64e00e8..99bd3f3 100755
+--- a/gen_initramfs.sh
++++ b/gen_initramfs.sh
+@@ -410,7 +410,7 @@ append_zfs(){
+ 	for i in /etc/zfs/{zdev.conf,zpool.cache}
+ 	do
+ 		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" \
+-			|| gen_die "Could not copy file ${i} for ZFS"
++			|| print_warning 1 "Could not copy file ${i} for ZFS"
+ 	done
+ 
+ 	# Copy binaries
diff --git a/sys-kernel/genkernel/genkernel-3.4.41-r1.ebuild b/sys-kernel/genkernel/genkernel-3.4.41-r1.ebuild
new file mode 100644
index 000000000..57e553d29
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.41-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.41.ebuild,v 1.2 2012/08/14 15:56:50 ryao Exp $
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI="3"
+
+VERSION_BUSYBOX='1.20.1'
+VERSION_DMRAID='1.0.0.rc16-3'
+VERSION_MDADM='3.1.5'
+VERSION_FUSE='2.8.6'
+VERSION_ISCSI='2.0-872'
+VERSION_LVM='2.02.88'
+VERSION_UNIONFS_FUSE='0.24'
+VERSION_GPG='1.4.11'
+
+RH_HOME="ftp://sources.redhat.com/pub"
+DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="http://www.busybox.net/downloads"
+
+COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
+		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
+		mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
+		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
+		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
+		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
+		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
+		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
+		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
+
+if [[ ${PV} == 9999* ]]
+then
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
+		http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
+	inherit git-2 bash-completion-r1 eutils
+	S="${WORKDIR}/${PN}"
+	SRC_URI="${COMMON_URI}"
+	KEYWORDS=""
+else
+	inherit bash-completion-r1 eutils
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		${COMMON_URI}"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="crypt cryptsetup ibm pentoo selinux"  # Keep 'crypt' in to keep 'use crypt' below working!
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+		cryptsetup? ( sys-fs/cryptsetup )
+		app-arch/cpio
+		>=app-misc/pax-utils-0.2.1
+		!<sys-apps/openrc-0.9.9"
+# pax-utils is used for lddtree
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${P}.tar.bz2
+	fi
+}
+
+src_prepare() {
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
+		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
+		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
+		-e "s:VERSION_LVM:$VERSION_LVM:" \
+		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
+		-e "s:VERSION_GPG:$VERSION_GPG:" \
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+
+	use pentoo && epatch "${FILESDIR}"/9999-pass-2.patch
+	epatch "${FILESDIR}"/zfs-fix.patch
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf || die "doins genkernel.conf"
+
+	doman genkernel.8 || die "doman"
+	dodoc AUTHORS ChangeLog README TODO || die "dodoc"
+
+	dobin genkernel || die "dobin genkernel"
+
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	insinto /usr/share/genkernel
+	doins -r "${S}"/* || die "doins"
+	use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
+		cp "${S}"/arch/ppc64/kernel-2.6.g5 "${S}"/arch/ppc64/kernel-2.6
+
+	# Copy files to /var/cache/genkernel/src
+	elog "Copying files to /var/cache/genkernel/src..."
+	mkdir -p "${D}"/var/cache/genkernel/src
+	cp -f \
+		"${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2 \
+		"${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
+		"${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
+		"${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \
+		"${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz \
+		"${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 \
+		"${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2 \
+		"${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
+		"${D}"/var/cache/genkernel/src || die "Copying distfiles..."
+
+	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+}
+
+pkg_postinst() {
+	echo
+	elog 'Documentation is available in the genkernel manual page'
+	elog 'as well as the following URL:'
+	echo
+	elog 'http://www.gentoo.org/doc/en/genkernel.xml'
+	echo
+	ewarn "This package is known to not work with reiser4.  If you are running"
+	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
+	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
+	ewarn "broken in this regard.  Try using a sane filesystem like ext3 or"
+	ewarn "even reiser3."
+	echo
+	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
+	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
+	echo
+	if use crypt && ! use cryptsetup ; then
+		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
+		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
+		ewarn "to have genkernel create an initramfs with LUKS support."
+		ewarn "Sorry for the inconvenience."
+		echo
+	fi
+}