diff --git a/scripts/include/card-helpers.inc b/scripts/include/card-helpers.inc
index 171bbad..a2e9262 100644
--- a/scripts/include/card-helpers.inc
+++ b/scripts/include/card-helpers.inc
@@ -333,12 +333,14 @@ StartCardKernelWrite() {
     if [ -z "$Machine" ]; then
         Machine="$DEFAULT_MACHINE_FAMILY"
     fi
-    if [ -z "$FindString" ]; then
-        FindString="$DEFAULT_FIND_KERNEL"
-    fi
     if [ -z "$KernelImageType" ]; then
         KernelImageType="$DEFAULT_KERNEL_IMAGE_TYPE"
     fi
+    if [ -z "$FindString" ]; then
+        # we create an extra link on kernel to make things easier - see
+        # appends/oe-core/linux%.bbappend
+        FindString="-name ${KernelImageType}-abiversion-* -type l"
+    fi
 
     RunUserStartRoot "${style_bold}Kernel on %DevicePath% will be overwritten by %DeployedFile%${style_normal}"
     PrepareWrite
diff --git a/scripts/include/machine-imx.inc b/scripts/include/machine-imx.inc
index 60329e4..49191d2 100644
--- a/scripts/include/machine-imx.inc
+++ b/scripts/include/machine-imx.inc
@@ -10,7 +10,6 @@
 DEFAULT_MACHINE_FAMILY='*imx*'
 DEFAULT_FIND_ROOTFS='-name *.sdcard -o -name *.wic.gz -type l'
 DEFAULT_KERNEL_IMAGE_TYPE='uImage'
-DEFAULT_FIND_KERNEL="-name ${DEFAULT_KERNEL_IMAGE_TYPE}-abiversion-* -type l"
 
 # callback for card-write
 RootCardWriteCallback() {
diff --git a/scripts/include/machine-raspberrypi.inc b/scripts/include/machine-raspberrypi.inc
index 7ef43eb..4e7b666 100644
--- a/scripts/include/machine-raspberrypi.inc
+++ b/scripts/include/machine-raspberrypi.inc
@@ -10,7 +10,6 @@
 DEFAULT_MACHINE_FAMILY='raspberrypi*'
 DEFAULT_FIND_ROOTFS='-name *.rpi-sdimg -type l'
 DEFAULT_KERNEL_IMAGE_TYPE='Image'
-DEFAULT_FIND_KERNEL="-name ${DEFAULT_KERNEL_IMAGE_TYPE}-abiversion-* -type l"
 
 # callback for card-write
 RootCardWriteCallback() {
diff --git a/scripts/include/machine-ti-old-omap.inc b/scripts/include/machine-ti-old-omap.inc
index 655c546..fe8d030 100644
--- a/scripts/include/machine-ti-old-omap.inc
+++ b/scripts/include/machine-ti-old-omap.inc
@@ -10,7 +10,6 @@
 DEFAULT_MACHINE_FAMILY=''
 DEFAULT_FIND_ROOTFS='-name *.tar.bz2 -type l'
 DEFAULT_KERNEL_IMAGE_TYPE='zImage'
-DEFAULT_FIND_KERNEL="-name ${DEFAULT_KERNEL_IMAGE_TYPE}-abiversion-* -type l"
 
 # callback for card-write
 RootCardWriteCallback() {