diff --git a/scripts/image b/scripts/image
index 94e96fc3ed..65018f1d9d 100755
--- a/scripts/image
+++ b/scripts/image
@@ -157,8 +157,7 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
   fi
 
 # run depmod
-  KVER=`ls $BUILD/linux-*/modules/lib/modules`
-  $ROOT/$TOOLCHAIN/bin/depmod -b $INSTALL $KVER > /dev/null
+  $ROOT/$TOOLCHAIN/bin/depmod -b $INSTALL `kernel_version` > /dev/null
 
 # strip kernel modules
   for MOD in `find $INSTALL/lib/modules/ -name *.ko`; do
@@ -292,7 +291,7 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
       sed -e "s%@DISTRONAME@%$DISTRONAME%g" \
           -e "s%@OPENELEC_VERSION@%$OPENELEC_VERSION%g" \
           -e "s%@RELEASE_DATE@%$(date +%F)%g" \
-          -e "s%@KERNEL_VERSION@%$(echo $(basename $BUILD/linux-*) | awk -F - '{print $2}')%g" \
+          -e "s%@KERNEL_VERSION@%$(kernel_version)%g" \
           -e "s%@DESCRIPTION@%$DESCRIPTION%g" \
           -i $RELEASE_DIR/os.json