diff --git a/icwmp/Makefile b/icwmp/Makefile
index 094868902..e562171fd 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.2.19
+PKG_VERSION:=8.2.20
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d18400eca5e22abfefacd386e669466d16d1b18e
+PKG_SOURCE_VERSION:=9b22b59edfd6ce687b039929901d9035b2be07b4
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
diff --git a/icwmp/files/etc/init.d/icwmpd b/icwmp/files/etc/init.d/icwmpd
index 3854b03a3..0ef892b1a 100755
--- a/icwmp/files/etc/init.d/icwmpd
+++ b/icwmp/files/etc/init.d/icwmpd
@@ -95,14 +95,14 @@ copy_cwmp_etc_files_to_varstate() {
 		fi
 	fi
 
-	mkdir -p /var/state/icwmpd
-	if [ -f /etc/icwmpd/.icwmpd_backup_session.xml ]
+	mkdir -p /var/run/icwmpd
+	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]
 	then
-		mv /etc/icwmpd/.icwmpd_backup_session.xml /var/state/icwmpd 2>/dev/null
+		mv /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd 2>/dev/null
 	fi
-	if [ -f /etc/icwmpd/.dm_enabled_notify.xml ]
+	if [ -f /etc/icwmpd/dm_enabled_notify.xml ]
 	then
-		mv /etc/icwmpd/.dm_enabled_notify /var/state/icwmpd 2>/dev/null
+		mv /etc/icwmpd/dm_enabled_notify /var/run/icwmpd 2>/dev/null
 	fi
 }
 
@@ -111,13 +111,13 @@ copy_cwmp_varstate_files_to_etc() {
 	then
 		cp /var/state/cwmp /etc/icwmpd 2>/dev/null
 	fi
-	if [ -f /var/state/icwmpd/.icwmpd_backup_session.xml ]
+	if [ -f /var/run/icwmpd/icwmpd_backup_session.xml ]
 	then
-		cp /var/state/icwmpd/.icwmpd_backup_session.xml /etc/icwmpd 2>/dev/null
+		cp /var/run/icwmpd/icwmpd_backup_session.xml /etc/icwmpd 2>/dev/null
 	fi
-	if [ -f /var/state/icwmpd/.dm_enabled_notify.xml ]
+	if [ -f /var/run/icwmpd/dm_enabled_notify.xml ]
 	then
-		cp /var/state/icwmpd/.dm_enabled_notify /etc/icwmpd 2>/dev/null
+		cp /var/run/icwmpd/dm_enabled_notify /etc/icwmpd 2>/dev/null
 	fi
 }
 
diff --git a/icwmp/files/lib/upgrade/keep.d/icwmp b/icwmp/files/lib/upgrade/keep.d/icwmp
index afa8948d5..88faf92ed 100644
--- a/icwmp/files/lib/upgrade/keep.d/icwmp
+++ b/icwmp/files/lib/upgrade/keep.d/icwmp
@@ -1 +1 @@
-/var/state/icwmpd/.icwmpd_backup_session.xml
+/var/run/icwmpd/icwmpd_backup_session.xml