diff --git a/src/addon/VERSION b/src/addon/VERSION
index 760606e1..3659ea2f 100644
--- a/src/addon/VERSION
+++ b/src/addon/VERSION
@@ -1 +1 @@
-5.7
+5.8
diff --git a/src/rc.d/jp-hb-devices-addon b/src/rc.d/jp-hb-devices-addon
index a65b95f3..2da97a1b 100755
--- a/src/rc.d/jp-hb-devices-addon
+++ b/src/rc.d/jp-hb-devices-addon
@@ -159,6 +159,11 @@ case "$1" in
         ### delete the old (current) addon directory and rename the newly uploaded 
         if [ -d ${NEW_ADDON_DIR} ]; then
           if [ -d ${ADDON_DIR} ]; then
+            ### backup customized_firmware files in new addon directory, before deleting the old (current) one!
+            if [ "$(find ${CUSTOMIZED_FIRMWARE_DIR} -type f -iname '*.xml')" ]; then
+              echo "Copying customized firmware files to new addon directory" | tee -a $TMP_LOGFILE
+              cp ${CUSTOMIZED_FIRMWARE_DIR}/*.xml ${NEW_ADDON_DIR}/customized_firmware/
+            fi
             echo "Deleting current addon directory " | tee $TMP_LOGFILE
             rm -rf ${ADDON_DIR}
           fi