diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 33d6b73c9..d679e850a 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -32,4 +32,4 @@ EBUILD genkernel-3.4.32.ebuild 5677 SHA256 7ffa9daa56da3768bdc03194479d27d1fa57c
 EBUILD genkernel-3.4.33.1.ebuild 5478 SHA256 3d6fb20a9ba82ac0f664fad64d47228208597170161d2227362c019e7b026a5c SHA512 0e48a733234b56819f3d17884f4a5cf16e2311e53b75947ae828ba6dd44aa96b8a5ea54288b4d3dc472ef5b6ab354cad10d4f503613efed280abb94df5d89f3c WHIRLPOOL 8e6b2279559bec6823489c97cbed98f333225fa56bf526e79b9080bcada205d3a6fdaf64fab63b0ce2070ab8103e6a0ae45a6840018412e289fb5833e77f46a6
 EBUILD genkernel-9999.2540.ebuild 5009 SHA256 54e051c18952c325edb2432a0eceaa5472e2209afd442f198eec47109e1d50f6 SHA512 b77d443b2f967e0cf5ea337788db92fd6f840b22faed367bfe8a1d791917f49ec36e7ed9013b776c845d0679dd468f150e66c8c3998477ab43a192fbe1dd2fa1 WHIRLPOOL f49d3a172d5a5d1826fcbacad8d79212085f6a9007062d644a07590572a0f63dec743d4bf7bbb02b936b865616816035593406a6e8a3ef39179d3b92f7868c09
 EBUILD genkernel-9999.2998.ebuild 5009 SHA256 9d33c03cd3d32f34620e2a36c3d0e11416fe40da9b3e081e15ffcc3429289bfd SHA512 6f422752a95cff10460bf2d8ff95731889b03a758d6fb9464f44d118c15f2a2cd48f063c8ceee21e8d397ee3cd90df99f66236ab7ddd9167278b83bf37de066a WHIRLPOOL 8187aafde2b43b03bfa69bbfcaf43dc2a9661cb097e3ddf51d2aa6135fa72e0e1d3510c264357537da5d69f86b18944675953772718845d520eb20ed4fa8e4d1
-EBUILD genkernel-9999.ebuild 5163 SHA256 993bb56492bbc227bc33e27bb196f730ea4ba89ee61a6e6feaf692f7c82e64b8 SHA512 505d67afeb3e35946a0c2ff53b709911288176776205e37703a17b9b08869fd7f4558650b6ad3269fa3191c99ea4e47a6b1b56cb3a3684d9555d6c5f23cfd85d WHIRLPOOL acec88e18ed02577e7bfe1573a24ae6644b7b001004194118730d8f2ac23b3fe61fb58cfb508de85153f214b9ee00e04eaa4d398007e43ecfb6cfc5a441223e5
+EBUILD genkernel-9999.ebuild 5159 SHA256 a10cb5d5c4050e73ea7683e5c00200f1c92c7b663503125889cf6e546cf2aee1 SHA512 b71e07a64b1b9f0b97d9fa92bf1b8e6755a66eae501670166672b8a7071be2019e5d9018e67f7ce8cdac64f9df86f1ef621f71adea3c351fc772190730cab763 WHIRLPOOL ff13ef4c67969fdd1edbc7accc90de0861184d9e9adcb6c733813532ecc0fcfe11d812261d56935de41b705d27864fc39110069f72cd51191adf0b510e3e11d7
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index 963b8bd02..84ca066db 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.39 2012/07/24 06:49:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.42 2012/08/14 15:56:50 ryao Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -59,7 +59,7 @@ DEPEND="sys-fs/e2fsprogs
 RDEPEND="${DEPEND}
 		cryptsetup? ( sys-fs/cryptsetup )
 		app-arch/cpio
-		app-misc/pax-utils
+		>=app-misc/pax-utils-0.2.1
 		!<sys-apps/openrc-0.9.9"
 # pax-utils is used for lddtree
 
@@ -73,7 +73,24 @@ 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"
+
 	cd "${S}"
 	use pentoo && epatch "${FILESDIR}"/9999-pass-2.patch
 }
@@ -85,20 +102,8 @@ src_compile() {
 }
 
 src_install() {
-	# This block updates genkernel.conf
-	sed \
-		-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}"/genkernel.conf > "${T}"/genkernel.conf \
-		|| die "Could not adjust versions"
 	insinto /etc
-	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
+	doins "${S}"/genkernel.conf || die "doins genkernel.conf"
 
 	doman genkernel.8 || die "doman"
 	dodoc AUTHORS ChangeLog README TODO || die "dodoc"