diff --git a/lib/main.sh b/lib/main.sh
index a9e7d3c6a5..e2be88911f 100644
--- a/lib/main.sh
+++ b/lib/main.sh
@@ -300,19 +300,11 @@ fi
 
 overlayfs_wrapper "cleanup"
 
-# extract kernel version
-if [[ -f $DEST/debs/${CHOSEN_KERNEL}_${REVISION}_${ARCH}.deb && $BUILD_ALL != yes ]]; then
-	VER=$(dpkg --info $DEST/debs/${CHOSEN_KERNEL}_${REVISION}_${ARCH}.deb | grep Descr | awk '{print $(NF)}' | sed "s/-$LINUXFAMILY//")
-else
-	VER=$(grep -E "^VERSION|^PATCHLEVEL|^SUBLEVEL" $SRC/cache/sources/$LINUXSOURCEDIR/Makefile | awk '{print $(NF)}' | paste -sd "." -)
-fi
+# extract kernel version from .deb package
+VER=$(dpkg --info $DEST/debs/${CHOSEN_KERNEL}_${REVISION}_${ARCH}.deb | grep Descr | awk '{print $(NF)}')
+VER="${VER/-$LINUXFAMILY/}"
 
-# extract u-boot version
-if [[ -f  $DEST/debs/${CHOSEN_UBOOT}_${REVISION}_${ARCH}.deb && $BUILD_ALL != yes ]]; then
-	UBOOT_VER=$(dpkg --info $DEST/debs/${CHOSEN_UBOOT}_${REVISION}_${ARCH}.deb | grep Descr | awk '{print $(NF)}')
-else
-	UBOOT_VER=$(grep -E "^VERSION|^PATCHLEVEL" $SRC/cache/sources/$BOOTSOURCEDIR/Makefile | awk '{print $(NF)}' | paste -sd "." -)
-fi
+UBOOT_VER=$(dpkg --info $DEST/debs/${CHOSEN_UBOOT}_${REVISION}_${ARCH}.deb | grep Descr | awk '{print $(NF)}')
 
 # create board support package
 [[ -n $RELEASE && ! -f $DEST/debs/$RELEASE/${CHOSEN_ROOTFS}_${REVISION}_${ARCH}.deb ]] && create_board_package