diff --git a/homematic/CHANGELOG.md b/homematic/CHANGELOG.md
index 965f41a..dbe88d6 100644
--- a/homematic/CHANGELOG.md
+++ b/homematic/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 #### WARNING: This add-on is considered to be obsolete/retired in favor of the much more advanced third-party [RaspberryMatic CCU](https://github.com/jens-maus/RaspberryMatic/tree/master/home-assistant-addon) add-on for running a HomeMatic/homematicIP smart home central within HomeAssistant. If you want to migrate to the new add-on, please make sure to update to the latest version of this old "HomeMatic CCU" add-on first and then use the WebUI-based backup routines to export a `*.sbk` config backup file which you can then restore in the new "RaspberryMatic CCU" add-on afterwards (cf. [RaspberryMatic Documentation](https://github.com/jens-maus/RaspberryMatic/wiki/Installation-HomeAssistant))
 
+## 99.0.5
+
+- integrated yet another backup script fix to avoid errors on backup creation.
+
 ## 99.0.4
 
 - integrated another backup script fix to avoid errors on backup creation.
diff --git a/homematic/config.yaml b/homematic/config.yaml
index 2fdb5bb..dd5a8cf 100644
--- a/homematic/config.yaml
+++ b/homematic/config.yaml
@@ -1,4 +1,4 @@
-version: 99.0.4
+version: 99.0.5
 slug: homematic
 name: HomeMatic CCU
 description: HomeMatic central based on OCCU
diff --git a/homematic/rootfs/opt/hm/bin/createBackup.sh b/homematic/rootfs/opt/hm/bin/createBackup.sh
index 675fd93..431c0dc 100755
--- a/homematic/rootfs/opt/hm/bin/createBackup.sh
+++ b/homematic/rootfs/opt/hm/bin/createBackup.sh
@@ -68,8 +68,9 @@ if [[ -d "${TMPDIR}" ]]; then
   cp -a /data/* "${TMPDIR}/usr/local/etc/config/"
 
   # move crRFD files to data sub-dir to be compatible
-  mkdir -p "${TMPDIR}/usr/local/etc/config/crRFD/data"
-  mv "${TMPDIR}/usr/local/etc/config/crRFD/*" "${TMPDIR}/usr/local/etc/config/crRFD/data/" 2>/dev/null || true
+  rm -rf "${TMPDIR}/usr/local/etc/config/crRFD"
+  mkdir -p "${TMPDIR}/usr/local/etc/config/crRFD"
+  cp -a /data/crRFD "${TMPDIR}/usr/local/etc/config/crRFD/data"
 
   # cleanup
   rm -f "${TMPDIR}/usr/local/etc/config/options.json"