diff --git a/packages/sysutils/busybox/scripts/createlog b/packages/sysutils/busybox/scripts/createlog
index 217c6c08e6..91512a907b 100755
--- a/packages/sysutils/busybox/scripts/createlog
+++ b/packages/sysutils/busybox/scripts/createlog
@@ -24,7 +24,7 @@ DATE=`date -u +%Y-%m-%d-%H.%M.%S`
 BASEDIR="/tmp"
 LOGDIR="log-$DATE"
 RELEASE="`cat /etc/release`"
-GIT="`cat /etc/issue |grep git`"
+GIT="`cat /etc/issue | grep git`"
 
 getlog_cmd() {
   if command -v $1 >/dev/null; then
@@ -74,8 +74,24 @@ rm -rf $BASEDIR/$LOGDIR
 mkdir -p $BASEDIR/$LOGDIR
 
 # kodi.log
+  KODI_LOG_DIR=/storage/.kodi/temp
+
   LOGFILE="01_KODI.log"
-  for i in `find /storage/.kodi/temp/ -type f -name "*.log"`; do
+  for i in kodi.log kodi.old.log; do
+    [ -f ${KODI_LOG_DIR}/${i} ] && getlog_cmd cat ${KODI_LOG_DIR}/$i
+  done
+
+  LOGFILE="01_KODI_CRASH.log"
+  for i in `find ${KODI_LOG_DIR} -type f -name "kodi_crashlog_*.log" | sort -r`; do
+    getlog_cmd cat $i
+  done
+
+  LOGFILE="01_KODI_OTHER.log"
+  for i in `find ${KODI_LOG_DIR} -type f -name "*.log" | sort`; do
+    iname="${i#${KODI_LOG_DIR}/}"
+    [ ${iname} == kodi.log ] && continue
+    [ ${iname} == kodi.old.log ] && continue
+    [ "${iname#kodi_crashlog_}" != "${iname}" ] && continue
     getlog_cmd cat $i
   done