diff --git a/eclass/sablink-kernel.eclass b/eclass/sablink-kernel.eclass
index b7d0cbb..a064d4d 100644
--- a/eclass/sablink-kernel.eclass
+++ b/eclass/sablink-kernel.eclass
@@ -229,8 +229,7 @@ _get_real_kv_full() {
 	elif [[ "${OKV/.*}" = "3" ]]; then
 		# Linux 3.x support, KV_FULL is set to: 3.0-sablink
 		# need to add another final .0 to the version part
-		#echo "${ORIGINAL_KV_FULL/-/.0-}"
-		echo "${ORIGINAL_KV_FULL}"
+		echo "${ORIGINAL_KV_FULL/-/.0-}"
 	else
 		echo "${ORIGINAL_KV_FULL}"
 	fi
@@ -810,7 +809,7 @@ _kernel_src_compile() {
 				-d zImage.new "${WORKDIR}"/boot/uImage-genkernel-${ARCH}-${KV_FULL}.buffalo
 			einfo "Create uInitrd with correct start address"
 			mkimage -A arm -O linux -T ramdisk -C none -a 0x00000000 -e 0x00000000 -n initrd-${KV_FULL} \
-				-d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/uInitramfs-genkernel-${ARCH}-${KV_FULL}.buffalo
+				-d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${ORIGINAL_KV_FULL} "${WORKDIR}"/boot/uInitramfs-genkernel-${ARCH}-${KV_FULL}.buffalo
 		fi
 	fi
 
@@ -819,12 +818,12 @@ _kernel_src_compile() {
 		mv "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/uImage-genkernel-${ARCH}-${KV_FULL}
 		einfo "Create uInitrd with correct start address"
 		mkimage -A arm -O linux -T ramdisk -C none -a 0x00000000 -e 0x00000000 -n initrd-${KV_FULL} \
-			-d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/uInitramfs-genkernel-${ARCH}-${KV_FULL}
+			-d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${ORIGINAL_KV_FULL} "${WORKDIR}"/boot/uInitramfs-genkernel-${ARCH}-${KV_FULL}
 	fi
 
 	# cleanup
 	rm -rf foo zImage.new ${K_SABKERNEL_DTB}
-	rm "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL}
+	rm "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${ORIGINAL_KV_FULL} "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${ORIGINAL_KV_FULL}
 }
 
 _setup_mkimage_ramdisk() {