diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template
index 334d773f6c..a1a77d3786 100644
--- a/srcpkgs/kernel/template
+++ b/srcpkgs/kernel/template
@@ -64,7 +64,7 @@ do_build()
 
 do_install()
 {
-	local arch lver hdrdest
+	local arch myver lver hdrdest
 
 	if [ "$xbps_machine" != "x86_64" ]; then
 		arch=i386
@@ -77,10 +77,17 @@ do_install()
 	# Install kernel, firmware and modules
 	install -d ${DESTDIR}/lib ${DESTDIR}/boot
 	make INSTALL_MOD_PATH=${DESTDIR} modules_install || return 1
-	if [ -n "$revision" ]; then
-		lver="${version}_${revision}"
+
+	if [ -n "${_kernel_snapshot}" ]; then
+		myver="${_kernel_ver}-${_kernel_patch_ver}"
 	else
-		lver="${version}"
+		myver=${version}
+	fi
+
+	if [ -n "$revision" ]; then
+		lver="${myver}_${revision}"
+	else
+		lver="${myver}"
 	fi
 
 	hdrdest=${DESTDIR}/usr/src/kernel-headers-${lver}