diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 8bdfd2998..28afd8617 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -13,3 +13,4 @@ DIST unionfs-1.5pre-cvs200701042308.tar.gz 163418 RMD160 6d54be6db26a562dd943df2
 EBUILD genkernel-3.4.10-r3.ebuild 4211 RMD160 d8012f4bc99d052da3c9e1ab33ffde44c3dd879e SHA1 b89728bfd15955ee550328e615bd64a58df57e3a SHA256 3589e49f86d3d4da1a0eae9b554758f850fc8e69cf228f7c884cd21c173b0a45
 EBUILD genkernel-3.4.10-r4.ebuild 4213 RMD160 727c51a795a5c612285f58d360088e7889329d12 SHA1 ffeed0d8b41db153dce86f1a11cd6c689c799df8 SHA256 1548f37cd44ac6163011ff8d1f8e1032a2b401585dc978f08aa31eb97df478dc
 EBUILD genkernel-3.4.9-r3.ebuild 3749 RMD160 fb86bddccd22b706d7c5a2964eeeb78985ec3f56 SHA1 a260c0bf703c9d2b75df84f1b3edec988b365668 SHA256 66d3283b753a0f962e5377c92fd255c54f0a6f7c26d8263b68cf462946aba60d
+EBUILD genkernel-9999.1486.ebuild 4205 RMD160 fc4377d1abc9839ad1625cd8e481753e4c19d02e SHA1 31fe7d40de7de4f1352dc12aaca91c8b514752af SHA256 cecf24aa7b752b828f8ce0b3a831bb0d401f2f7ac8484573419b71ed8f565dc8
diff --git a/sys-kernel/genkernel/files/digest-genkernel-3.4.9-r3 b/sys-kernel/genkernel/files/digest-genkernel-3.4.9-r3
deleted file mode 100644
index 059abb73d..000000000
--- a/sys-kernel/genkernel/files/digest-genkernel-3.4.9-r3
+++ /dev/null
@@ -1,21 +0,0 @@
-MD5 940a882a71cae84f6befc8069a260ad1 LVM2.2.02.28.tgz 531905
-RMD160 bf6f25db6e34bf362353ae9557691a7f01962502 LVM2.2.02.28.tgz 531905
-SHA256 2d8d7b123e427d0bfb7471d7c17dfd88890eb98257ca22ea3be5d7307e83aceb LVM2.2.02.28.tgz 531905
-MD5 6b94db57cdc9022af1583b3f2acb91cd device-mapper.1.02.22.tgz 189726
-RMD160 8bf9986536c49f53c398d6a2180e21e1235bea18 device-mapper.1.02.22.tgz 189726
-SHA256 ff833a6cd6246686f5b3f5692fd6597f1ffbc60f08929e5fe68304cdafb61595 device-mapper.1.02.22.tgz 189726
-MD5 a0e7d0bb5394e15c878ac86afd72c08e dmraid-1.0.0.rc14.tar.bz2 164234
-RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c dmraid-1.0.0.rc14.tar.bz2 164234
-SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec dmraid-1.0.0.rc14.tar.bz2 164234
-MD5 06f7806782e357797fad1d34b7ced0c6 e2fsprogs-1.39.tar.gz 3695111
-RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b e2fsprogs-1.39.tar.gz 3695111
-SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3 e2fsprogs-1.39.tar.gz 3695111
-MD5 2a2584aa34b44cc372bba878fe166ebe genkernel-3.4.9.tar.bz2 157252
-RMD160 767cd8e223ac59202b6ea9e85f361ac3d5736276 genkernel-3.4.9.tar.bz2 157252
-SHA256 161eeaaef365ca6078d5e30901bb1721cf115fdec405d88c28a518dcf2127e90 genkernel-3.4.9.tar.bz2 157252
-MD5 0ec223ba6b159b4588bbdf9784725f18 genkernel-pkg-3.4-r3.tar.bz2 1915282
-RMD160 8424628e94c51d500f7b28532901ad0c5e53ee38 genkernel-pkg-3.4-r3.tar.bz2 1915282
-SHA256 0681579b34705de7fc7ec7a08154cea9dc21142b612f4b7d904a4b588e3de684 genkernel-pkg-3.4-r3.tar.bz2 1915282
-MD5 89d736859e5547db1384229160ad5410 unionfs-1.5pre-cvs200701042308.tar.gz 163418
-RMD160 6d54be6db26a562dd943df2de9cf0e0138c45c6f unionfs-1.5pre-cvs200701042308.tar.gz 163418
-SHA256 d1925eee22517df72828a7c75890c20a54335e135f6ed04ea43f8771c9b1c271 unionfs-1.5pre-cvs200701042308.tar.gz 163418
diff --git a/sys-kernel/genkernel/files/genkernel.bash b/sys-kernel/genkernel/files/genkernel.bash
new file mode 100644
index 000000000..ed6b1c166
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel.bash
@@ -0,0 +1,73 @@
+# genkernel (8) completion
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Written by Aron Griffis <agriffis@gentoo.org>
+
+_genkernel()
+{
+    declare cur prev genkernel_help actions params
+    COMPREPLY=()
+    cur=${COMP_WORDS[COMP_CWORD]}
+    prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    # extract initial list of params/actions from genkernel --help
+    genkernel_help=$(command genkernel --help)
+    actions=( $(<<<"$genkernel_help" sed -n \
+	'/^Available Actions:/,/^$/s/^[[:space:]]\+\([^[:space:]]\+\).*/\1/p') )
+    params=( $(<<<"$genkernel_help" egrep -oe '--[^[:space:]]{2,}') )
+
+    # attempt to complete the current parameter based on the list
+    COMPREPLY=($(compgen -W "${params[*]/=*/=} ${actions[*]}" -- "$cur"))
+
+    # if we don't have a rhs to complete
+    if [[ ${#COMPREPLY[@]} -gt 1 ]]; then
+	return
+    elif [[ ${#COMPREPLY[@]} -eq 0 && $cur != --*=* ]]; then
+	return
+    elif [[ ${#COMPREPLY[@]} -eq 1 && $COMPREPLY != --*= ]]; then
+	# using nospace completion, add an explicit space
+	COMPREPLY="${COMPREPLY} "
+	return
+    fi
+
+    # we have a unique lhs and need to complete the rhs
+    declare args lhs rhs
+    if [[ ${#COMPREPLY[@]} -eq 1 ]]; then
+	lhs=$COMPREPLY
+    else
+	lhs=${cur%%=*}=
+	rhs=${cur#*=}
+    fi
+
+    # genkernel's help gives clues as to what belongs on the rhs.
+    # extract the clue for the current parameter
+    args=" ${params[*]} "
+    args="${args##* $lhs}"
+    args="${args%% *}"
+
+    # generate a list of completions for the argument; this replaces args with
+    # an array of results
+    args=( $(case $args in
+	('<0-5>') compgen -W "$(echo {1..5})" -- "$rhs" ;;
+	('<outfile>'|'<file>') compgen -A file -o plusdirs -- "$rhs" ;;
+	('<dir>') compgen -A directory -S / -- "$rhs" ;;
+	('<tbz2>') compgen -G '*.tbz2' -G '*.tar.bz2' -o plusdirs -- "$rhs" ;;
+	(*) compgen -o bashdefault -- "$rhs" ;; # punt
+    esac) )
+
+    # we're using nospace completion to prevent spaces after paths that aren't
+    # "done" yet.  So do some hacking to the args to add spaces after
+    # non-directories.
+    declare slash=/
+    args=( "${args[@]/%/ }" )			# add space to all
+    args=( "${args[@]/%$slash /$slash}" )	# remove space from dirs
+
+    # recreate COMPREPLY
+    if [[ $cur == "$lhs"* ]]; then
+	COMPREPLY=( "${args[@]}" )
+    elif [[ ${#args[@]} -gt 0 ]]; then
+	COMPREPLY=( "${args[@]/#/$lhs}" )
+    fi
+}
+
+complete -o nospace -F _genkernel genkernel
diff --git a/sys-kernel/genkernel/genkernel-9999.1486.ebuild b/sys-kernel/genkernel/genkernel-9999.1486.ebuild
new file mode 100644
index 000000000..e69e5b9cd
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-9999.1486.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: Exp $
+
+# genkernel-9999        -> latest SVN
+# genkernel-9999.REV    -> use SVN REV
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI="2"
+VERSION_BUSYBOX='1.7.4'
+VERSION_DMAP='1.02.22'
+VERSION_DMRAID='1.0.0.rc14'
+VERSION_E2FSPROGS='1.40.9'
+VERSION_LVM='2.02.28'
+
+MY_HOME="http://dev.pentoo.ch/~grimmlin"
+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
+		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
+		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
+		${RH_HOME}/dm/device-mapper.${VERSION_DMAP}.tgz
+		${RH_HOME}/dm/old/device-mapper.${VERSION_DMAP}.tgz
+		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
+		mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz"
+
+if [[ ${PV} == 9999* ]]
+then
+	[[ ${PV} == 9999.* ]] && ESVN_UPDATE_CMD="svn up -r ${PV/9999./}"
+	ESVN_REPO_URI="https://www.pentoo.ch/svn/genkernel/trunk"
+	inherit subversion bash-completion eutils
+	S=${WORKDIR}/trunk
+	SRC_URI="${COMMON_URI}"
+else
+	inherit bash-completion eutils
+	SRC_URI="${MY_HOME}/genkernel/${P}.tar.bz2
+		${COMMON_URI}"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="http://trac.pentoo.ch/wiki/Genkernel"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+# Please don't touch individual KEYWORDS.  Since this is maintained/tested by
+# Release Engineering, it's easier for us to deal with all arches at once.
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+#KEYWORDS=""
+IUSE="ibm selinux +pentoo +crypt"
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND} app-arch/cpio
+			crypt? ( <app-crypt/gnupg-2[static]
+				 sys-fs/cryptsetup[-dynamic] )"
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		subversion_src_unpack
+	else
+		unpack ${P}.tar.bz2
+	fi
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
+}
+
+src_install() {
+	# This block updates genkernel.conf
+	sed -e "s:VERSION_DMAP:$VERSION_DMAP:" \
+		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+		-e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \
+		-e "s:VERSION_LVM:$VERSION_LVM:" \
+		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
+		|| die "Could not adjust versions"
+	insinto /etc
+	doins "${T}"/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}"/ppc64/kernel-2.6.g5 "${S}"/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}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
+		"${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
+		"${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \
+		"${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \
+		"${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \
+		"${D}"/var/cache/genkernel/src || die "Copying distfiles..."
+
+	dobashcompletion "${FILESDIR}"/genkernel.bash
+}
+
+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
+
+	bash-completion_pkg_postinst
+}