diff --git a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.7.ebuild b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.7.ebuild
index 32e8d75..6b7212c 100644
--- a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.7.ebuild
+++ b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.7.ebuild
@@ -13,7 +13,7 @@ detect_arch
 KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://github.com/sifive/meta-sifive"
 IUSE="experimental"
-EXTRAVERSION="-${PN}-*"
+EXTRAVERSION="-${PN}"
 DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and surface patches"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
 		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0001-surface3-oemb.patch
@@ -29,12 +29,9 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
 		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0011-amd-s0ix.patch
 "
 
-src_unpack() {
+src_prepare() {
 	kernel-2_src_unpack
 	unpack_set_extraversion
-}
-
-src_prepare() {
 	local SURFACE_PATCH
 	local SURFACE_PATCHES="
 	0001-surface3-oemb.patch